]> git.openstreetmap.org Git - rails.git/commitdiff
Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 5 Dec 2010 15:15:55 +0000 (15:15 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Dec 2010 15:15:55 +0000 (15:15 +0000)
Conflicts:
app/controllers/user_controller.rb

376 files changed:
app/controllers/api_controller.rb
app/controllers/browse_controller.rb
app/controllers/geocoder_controller.rb
app/controllers/site_controller.rb
app/controllers/user_controller.rb
app/helpers/application_helper.rb
app/models/client_application.rb
app/models/user.rb
app/views/layouts/site.html.erb
app/views/site/_potlatch.html.erb [new file with mode: 0644]
app/views/site/_potlatch2.html.erb [new file with mode: 0644]
app/views/site/edit.html.erb
app/views/site/index.html.erb
app/views/user/account.html.erb
config/example.application.yml
config/locales/be.yml
config/locales/br.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/de.yml
config/locales/dsb.yml
config/locales/en.yml
config/locales/eo.yml
config/locales/es.yml
config/locales/et.yml
config/locales/eu.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/fur.yml
config/locales/gl.yml
config/locales/hsb.yml
config/locales/hu.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/lb.yml
config/locales/mk.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/ru.yml
config/locales/sq.yml
config/locales/sv.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-CN.yml
config/potlatch/locales/af.yml
config/potlatch/locales/be-TARASK.yml [new file with mode: 0644]
config/potlatch/locales/dsb.yml
config/potlatch/locales/hsb.yml
config/potlatch/locales/id.yml
config/potlatch/locales/it.yml
config/potlatch/locales/lb.yml
config/potlatch/locales/mk.yml
config/potlatch/locales/nl.yml
config/potlatch/locales/pt-BR.yml
config/potlatch/locales/sl.yml
config/potlatch/locales/tr.yml
config/potlatch/locales/uk.yml
config/potlatch/locales/vi.yml
db/functions/Makefile
db/migrate/20101114011429_add_editor_preference_to_user.rb [new file with mode: 0644]
lib/editors.rb [new file with mode: 0644]
public/javascripts/map.js
public/javascripts/menu.js [new file with mode: 0644]
public/javascripts/site.js
public/potlatch2/FontLibrary.swf [new file with mode: 0644]
public/potlatch2/bikeshops.css [new file with mode: 0644]
public/potlatch2/bing_maps.png [new file with mode: 0644]
public/potlatch2/bugs.css [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/bike-shop.png [new file with mode: 0644]
public/potlatch2/features/bugs/fixed.png [new file with mode: 0644]
public/potlatch2/features/bugs/invalid.png [new file with mode: 0644]
public/potlatch2/features/bugs/open.png [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__living_street.png [new file with mode: 0644]
public/potlatch2/features/highway__motorway.png [new file with mode: 0644]
public/potlatch2/features/highway__motorway_link.png [new file with mode: 0644]
public/potlatch2/features/highway__primary.png [new file with mode: 0644]
public/potlatch2/features/highway__primary_link.png [new file with mode: 0644]
public/potlatch2/features/highway__residential.png [new file with mode: 0644]
public/potlatch2/features/highway__secondary.png [new file with mode: 0644]
public/potlatch2/features/highway__secondary_link.png [new file with mode: 0644]
public/potlatch2/features/highway__service.png [new file with mode: 0644]
public/potlatch2/features/highway__tertiary.png [new file with mode: 0644]
public/potlatch2/features/highway__tertiary_link.png [new file with mode: 0644]
public/potlatch2/features/highway__track.png [new file with mode: 0644]
public/potlatch2/features/highway__trunk.png [new file with mode: 0644]
public/potlatch2/features/highway__trunk_link.png [new file with mode: 0644]
public/potlatch2/features/highway__unclassified.png [new file with mode: 0644]
public/potlatch2/features/highway__unknown.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__drain.png [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__slipway.png [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/features/waterway__weir.png [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/vectors.xml [new file with mode: 0644]
public/potlatch2/wireframe.css [new file with mode: 0644]
public/stylesheets/common.css
public/stylesheets/print.css
test/functional/site_controller_test.rb
test/unit/user_test.rb

index d66fbb28fba73171b9155369f410958f5d9f3932..95cc88869c054e1b82d363961c109d1485f48347 100644 (file)
@@ -46,7 +46,7 @@ class ApiController < ApplicationController
     root = XML::Node.new 'gpx'
     root['version'] = '1.0'
     root['creator'] = 'OpenStreetMap.org'
-    root['xmlns'] = "http://www.topografix.com/GPX/1/0/"
+    root['xmlns'] = "http://www.topografix.com/GPX/1/0"
     
     doc.root = root
 
index 9aec1060a19b3c836e455c0abcc0dd36c79ec8cc..a7dd5f5c95ff8b745b19fc3cac1831ac38c2177a 100644 (file)
@@ -72,8 +72,10 @@ class BrowseController < ApplicationController
     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
     @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )
 
-    @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
-    @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
+    if @changeset.user.data_public?
+      @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] )
+      @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", { :id => @changeset.id, :user_id => @changeset.user_id }] )
+    end
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
index d07b74f119d399e4c68e5b6a72fd7d6745c141ff..29e7648afed5878eecbcdc05bb43a2d2b869e47c 100644 (file)
@@ -234,7 +234,7 @@ class GeocoderController < ApplicationController
     end
 
     # ask nominatim
-    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # create result array
     @results = Array.new
@@ -355,7 +355,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|
index 1478c5773cda99cf2b59c9b15f6fbfc4eaba6cb3..73f38f78c6b0ccf4eee941270940a701e3936eaa 100644 (file)
@@ -30,4 +30,41 @@ class SiteController < ApplicationController
   def key
     expires_in 7.days, :public => true
   end
+
+  def edit
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+
+    if editor == "remote"
+      render :action => :index
+    else
+      # Decide on a lat lon to initialise potlatch with. Various ways of doing this
+      if params['lon'] and params['lat']
+        @lon = params['lon'].to_f
+        @lat = params['lat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['mlon'] and params['mlat']
+        @lon = params['mlon'].to_f
+        @lat = params['mlat'].to_f
+        @zoom = params['zoom'].to_i
+
+      elsif params['gpx']
+        @lon = Trace.find(params['gpx']).longitude
+        @lat = Trace.find(params['gpx']).latitude
+
+      elsif cookies.key?("_osm_location")
+        @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
+
+      elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
+        @lon = @user.home_lon
+        @lat = @user.home_lat
+
+      else
+        #catch all.  Do nothing.  lat=nil, lon=nil
+        #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
+      end
+
+      @zoom = '14' if @zoom.nil?
+    end
+  end
 end
index d456c1353ef9f45a230927d09a804f61f0ba1cd4..1193ec9106b151887fb7518bd727184bd19276ef 100644 (file)
@@ -108,6 +108,7 @@ class UserController < ApplicationController
       if @user.save
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer)))
+        session[:token] = @user.tokens.create.token
         redirect_to :action => 'login'
       else
         render :action => 'new'
@@ -139,6 +140,12 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
+      if params[:user][:preferred_editor] == "default"
+        @user.preferred_editor = nil
+      else
+        @user.preferred_editor = params[:user][:preferred_editor]
+      end
+
       @user.openid_url = nil if params[:user][:openid_url].empty?
 
       if params[:user][:openid_url].length > 0 and
@@ -283,14 +290,29 @@ class UserController < ApplicationController
           user.save!
           referer = token.referer
           token.destroy
-          session[:user] = user.id
 
-          unless referer.nil?
+          if session[:token] 
+            token = UserToken.find_by_token(session[:token])
+            session.delete(:token)
+          else
+            token = nil
+          end
+
+          if token.nil? or token.user != user
             flash[:notice] = t('user.confirm.success')
-            redirect_to referer
+            redirect_to :action => :login, :referer => referer
           else
-            flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
-            redirect_to :action => 'account', :display_name => user.display_name
+            token.destroy
+
+            session[:user] = user.id
+
+            if referer.nil?
+              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
+              redirect_to :action => :account, :display_name => user.display_name
+            else
+              flash[:notice] = t('user.confirm.success')
+              redirect_to referer
+            end
           end
         end
       else
index 2ccfcca2b0a5b8e33107d6731ae5f6b297ccf594..c24e7ff5be26b7a504c620ede19ea95d66ba30b5 100644 (file)
@@ -119,6 +119,16 @@ module ApplicationHelper
     end
   end
 
+  def preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor
+      @user.preferred_editor
+    else
+      DEFAULT_EDITOR
+    end
+  end
+
 private
 
   def javascript_strings_for_key(key)
index 9474a01370ea692bf14e22c5585c4ddb3a34c0e7..09eec40d3e5f020a4445282a485a312d98a6590c 100644 (file)
@@ -2,6 +2,7 @@ require 'oauth'
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken"
+  has_many :access_tokens
   validates_presence_of :name, :url, :key, :secret
   validates_uniqueness_of :key
   before_validation_on_create :generate_keys
@@ -53,6 +54,20 @@ class ClientApplication < ActiveRecord::Base
     RequestToken.create :client_application => self, :callback_url => self.token_callback_url
   end
 
+  def access_token_for_user(user)
+    unless token = access_tokens.find(:first, :conditions => { :user_id => user.id, :invalidated_at => nil })
+      params = { :user => user }
+
+      permissions.each do |p|
+        params[p] = true
+      end
+
+      token = access_tokens.create(params)
+    end
+    
+    token
+  end
+
   # the permissions that this client would like from the user
   def permissions
     ClientApplication.all_permissions.select { |p| self[p] }
index d5b75d073a2d14582a106c725f93d907b4e4d045..43f1bd85184eb278f387703029a442b109130aef 100644 (file)
@@ -34,6 +34,7 @@ class User < ActiveRecord::Base
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
+  validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
   before_save :encrypt_password
 
@@ -203,4 +204,10 @@ class User < ActiveRecord::Base
 
     return score.to_i
   end
+
+  ##
+  # return an oauth access token for a specified application
+  def access_token(application_key)
+    return ClientApplication.find_by_key(application_key).access_token_for_user(self)
+  end
 end
index b514fef990943e7ab5dd22e24820a5ba0d6583b8..2eae3963a49f859632528dfd5f13c0b68a93327c 100644 (file)
@@ -5,6 +5,7 @@
     <%= javascript_strings %>
     <%= javascript_include_tag 'prototype' %>
     <%= javascript_include_tag 'site' %>
+    <%= javascript_include_tag 'menu' %>
     <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
     <%= stylesheet_link_tag 'common' %>
     <!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
       </ul>
     </div>
 
+    <div id="editmenu">
+      <ul>
+        <% Editors::ALL_EDITORS.each do |editor| %>
+          <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor'} %></li>
+        <% end %>
+      </ul>
+    </div>
+
+    <script type="text/javascript">
+      createMenu("editanchor", "editmenu", 1000);
+    </script>
+
     <div id="left">
 
       <div id="logo">
diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
new file mode 100644 (file)
index 0000000..68205b6
--- /dev/null
@@ -0,0 +1,43 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+
+<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
+
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;
+  var winie=false; if (document.all && window.print) { winie=true; }
+  
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,sc) {
+    if (sc < 11) sc = 11;
+    fo.addVariable('winie',winie);
+    fo.addVariable('scale',sc);
+    fo.addVariable('token','<%= session[:token] %>');
+    if (lat) { fo.addVariable('lat',lat); }
+    if (lon) { fo.addVariable('long',lon); }
+    <% if params['gpx']     %>fo.addVariable('gpx'     ,'<%= h(params['gpx']    ) %>');<% end %>
+    <% if params['way']     %>fo.addVariable('way'     ,'<%= h(params['way']    ) %>');<% end %>
+    <% if params['node']    %>fo.addVariable('node'    ,'<%= h(params['node']   ) %>');<% end %>
+    <% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% end %>
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    doSWF(lat, lon, zoom || 15);
+  }
+</script>
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
new file mode 100644 (file)
index 0000000..a72975d
--- /dev/null
@@ -0,0 +1,53 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+
+<% token = @user.access_token(POTLATCH2_KEY) %>
+
+<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.potlatch2_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); }
+    <% if params['gpx'] %>
+    fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
+    <% end %>
+    fo.addVariable("zoom",zoom);
+    fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
+    fo.addVariable("connection","XML");
+    fo.addVariable("oauth_token","<%= token.token %>");
+    fo.addVariable("oauth_token_secret","<%= token.secret %>");
+    fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
+    fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
+    fo.addVariable("maximise_function","maximiseMap");
+    fo.addVariable("minimise_function","minimiseMap");
+    fo.addVariable("move_function","mapMoved");
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));
+  }
+
+  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
+    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
+  }
+</script>
index e5bffd1e4566c5490541e9a2c6e4322570308a6b..a9b915faf84413224bfac2eab1497378b65e48bf 100644 (file)
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'search' %>
 
-<%
-session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
+<%= render :partial => preferred_editor %>
 
-# Decide on a lat lon to initialise potlatch with. Various ways of doing this
-if params['lon'] and params['lat']
-       lon =  h(params['lon']) 
-       lat =  h(params['lat']) 
-       zoom =  h(params['zoom'])
-
-elsif params['mlon'] and params['mlat'] 
-       lon =  h(params['mlon']) 
-       lat =  h(params['mlat']) 
-       zoom =  h(params['zoom'])
-       
-elsif params['gpx']
-       #use gpx id to locate (dealt with below)
-       
-elsif cookies.key?("_osm_location")
-       lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-       
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
-       lon =  @user.home_lon
-       lat =  @user.home_lat
-
-else
-       #catch all.  Do nothing.  lat=nil, lon=nil
-       #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
-end
-
-zoom='14' if zoom.nil?
-%>
-
-<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("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
-  // 700,600 for fixed size, 100%,100% for resizable
-  var changesaved=true;
-  var winie=false; if (document.all && window.print) { winie=true; }
-  
-  window.onbeforeunload=function() {
-    if (!changesaved) {
-      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
-    }
-  }
-
-  function markChanged(a) { changesaved=a; }
-
-  function doSWF(lat,lon,sc) {
-    if (sc < 11) sc = 11;
-    fo.addVariable('winie',winie);
-    fo.addVariable('scale',sc);
-    fo.addVariable('token','<%= session[:token] %>');
-    if (lat) { fo.addVariable('lat',lat); }
-    if (lon) { fo.addVariable('long',lon); }
-    <% if params['gpx']     %>fo.addVariable('gpx'     ,'<%= h(params['gpx']    ) %>');<% end %>
-    <% if params['way']     %>fo.addVariable('way'     ,'<%= h(params['way']    ) %>');<% end %>
-    <% if params['node']    %>fo.addVariable('node'    ,'<%= h(params['node']   ) %>');<% end %>
-    <% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% end %>
-    fo.write("map");
-  }
-
-  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
-
-  function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom || 15);
-  }
-
   function resizeContent() {
     var content = $("content");
     var rightMargin = parseInt(getStyle(content, "right"));
index a89212238a26e7706b18a3239b711b284a700abe..7b1d874e7c0f146785137caa20fcbe29818f06af 100644 (file)
@@ -19,6 +19,9 @@
 <div id="map">
 </div>
 
+<iframe id="linkloader" style="display: none">
+</iframe>
+
 <div id="permalink">
   <a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a><br/>
   <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
@@ -267,10 +270,37 @@ end
     resizeMap();
   }
 
+  function remoteEditHandler(event) {
+    var extent = getMapExtent();
+    var loaded = false;
+
+    $("linkloader").observe("load", function () { loaded = true; });
+    $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom;
+
+    setTimeout(function () {
+      if (!loaded) alert("<%= t('site.index.remote_failed') %>");
+    }, 1000);
+
+    event.stop();
+  }
+
+  function installEditHandler() {
+    $("remoteanchor").observe("click", remoteEditHandler);
+
+    <% if preferred_editor == "remote" %>
+      $("editanchor").observe("click", remoteEditHandler);
+
+      <% if params[:action] == "edit" %>
+        remoteEditHandler();
+      <% end %>
+    <% end %>
+  }
+
   mapInit();
 
-  window.onload = handleResize;
-  window.onresize = handleResize;
+  Event.observe(window, "load", installEditHandler);
+  Event.observe(window, "load", handleResize);
+  Event.observe(window, "resize", handleResize);
 
   <% if params['action'] == 'export' %>
   <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
index 3bfd7577ef09617ea3efdeb71adb9462f8da3a01..161f8f4f9882290bbfed9bcdba59f20075e9c993 100644 (file)
     <td><%= f.text_field :languages %></td>
   </tr>
 
+  <tr>
+    <td class="fieldName" valign="top"><%= t 'user.account.preferred editor' %></td>
+    <td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
+  </tr>
+
   <tr>
     <td class="fieldName" valign="top">
       <%= t 'user.account.image' %>
index 9b00beb58de2fccc8ef964fa25d1a9ead65dbe7b..c88d894a0773980e6ba8569472c30e30e79e9ce5 100644 (file)
@@ -55,6 +55,12 @@ standard_settings: &standard_settings
   #file_column_root: ""
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
+  # URL of Nominatim instance to use for geocoding
+  nominatim_url: "http://nominatim.openstreetmap.org/"
+  # Default editor
+  default_editor: "potlatch"
+  # OAuth consumer key for Potlatch 2
+  #potlatch2_key: ""
 
 development:
   <<: *standard_settings
index 42c75a0db273f813563dcc2a5e7aee30477d23e7..9b975413f3ab0ccb3bbaf18f4f025828e1f22e5c 100644 (file)
@@ -1,6 +1,7 @@
 # Messages for Belarusian (Беларуская)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Тест
 be: 
   activerecord: 
     attributes: 
@@ -251,7 +252,7 @@ be:
       embeddable_html: HTML для ўстаўкі
       export_button: Экспарт
       export_details: Дадзеныя праекту OpenStreetMap распаўсюджваюцца па ліцэнзіі <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a>.
-      format: Фармат
+      format: "Фармат:"
       format_to_export: Фармат для экспарту
       image_size: Памер выявы
       latitude: "Шыр:"
index 03e2212be346862acb30e1cd20bdd14611305928..f2ff97a35cbe972a27b07accd636ccf401b4f73c 100644 (file)
@@ -991,6 +991,9 @@ br:
       title: Lenn ar gemennadenn
       to: Da
       unread_button: Merkañ evel anlennet
+      wrong_user: Kevreet oc'h evel "{{user}}", met ar gemennadenn a fell deoc'h lenn n'eo ket bet kaset na gant na d'an implijer-se. Mar plij kevreit gant ar gont reizh evit gellout lenn anezhi.
+    reply: 
+      wrong_user: Kevreet oc'h evel "{{user}}", met ar gemennadenn a fell deoc'h respont outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh evit gellout respont.
     sent_message_summary: 
       delete_button: Dilemel
   notifier: 
@@ -1048,6 +1051,7 @@ br:
     signup_confirm: 
       subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel"
     signup_confirm_html: 
+      ask_questions: Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war <a href="http://help.openstreetmap.org/">hol lec'hienn goulennoù-respontoù</a>.
       click_the_link: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat krouidigezh ho kont ha gouzout hiroc'h diwar-benn OpenStreetMap
       current_user: Ur roll eus an implijerien red dre rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Muioc'h a ditouroù diwar-benn OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide">war ar wiki</a> pe <a href="http://www.opengeodata.org/">war ar blog opengeodata</a> a ginnig ivez  <a href="http://www.opengeodata.org/?cat=13">podskignadennoù da selaou</a> !
@@ -1060,6 +1064,7 @@ br:
       video_to_openstreetmap: video evit kregiñ gant OpenStreetMap
       wiki_signup: Gallout a rit ivez <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">krouiñ ur gont war wiki OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù :"
       blog_and_twitter: "Tapout ar c'heleier diwezhañ diwar blog OpenStreetMap pe Twitter :"
       click_the_link_1: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat ho
       click_the_link_2: kont ha lenn muioc'h a ditouroù diwar-benn OpenStreetMap.
@@ -1388,6 +1393,8 @@ br:
       heading: Kadarnaat ur c'hemm chomlec'h postel
       press confirm button: Pouezit war ar bouton kadarnaat evit kadarnaat ho chomlec'h postel nevez.
       success: Kadarnaet eo ho chomlec'h postel, trugarez evit bezañ en em enskrivet !
+    confirm_resend: 
+      failure: N'eo ket bet kavet an implijer {{name}}.
     filter: 
       not_an_administrator: Ret eo deoc'h bezañ merour evit kas an ober-mañ da benn.
     go_public: 
index bc54193c48e607a71d9f32515560b2ef61ef9160..1df3f22b019c9b624d788883607202bdb1e6a676 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Jmontane
+# Author: Martorell
 # Author: PerroVerd
 # Author: SMP
 # Author: Ssola
@@ -116,6 +117,7 @@ ca:
     navigation: 
       all: 
         next_changeset_tooltip: Conjunt de canvis següent
+        next_node_tooltip: Node següent
         prev_changeset_tooltip: Conjunt de canvis anterior
       user: 
         name_changeset_tooltip: Visualitza les edicions feter per {{user}}
@@ -809,7 +811,7 @@ ca:
       image: "Imatge:"
       latitude: "Latitud:"
       longitude: "Longitud:"
-      my settings: La meva configuració
+      my settings: Preferències
       new image: Afegir una imatge
       preferred languages: "Llengües preferents:"
       profile description: "Descripció del perfil:"
index b29ba5185284a5515604ba581941a78b81ce72d3..8c19dddc9cffbf0c1d9cf242ead9ddc661ed42f1 100644 (file)
@@ -8,6 +8,8 @@
 cs: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Text
       diary_entry: 
         language: Jazyk
         latitude: Šířka
@@ -18,27 +20,33 @@ cs:
         friend: Přítel
         user: Uživatel
       message: 
+        body: Text
         recipient: Příjemce
         sender: Odesílatel
-        title: Nadpis
+        title: Předmět
       trace: 
         description: Popis
         latitude: Šířka
         longitude: Délka
         name: Název
+        public: Veřejná
         size: Velikost
         user: Uživatel
         visible: Viditelnost
       user: 
         active: Aktivní
         description: Popis
+        display_name: Zobrazované jméno
         email: E-mail
         languages: Jazyky
         pass_crypt: Heslo
     models: 
+      acl: Seznam přístupových práv
       changeset: Sada změn
       changeset_tag: Tag sady změn
       country: Země
+      diary_comment: Komentář k deníčku
+      diary_entry: Deníčkový záznam
       friend: Přítel
       language: Jazyk
       message: Zpráva
@@ -55,7 +63,12 @@ cs:
       relation: Relace
       relation_member: Člen relace
       relation_tag: Tag relace
+      trace: Stopa
+      tracepoint: Bod stopy
+      tracetag: Značka stopy
       user: Uživatel
+      user_preference: Uživatelské nastavení
+      user_token: Uživatelský token
       way: Cesta
       way_node: Uzel cesty
       way_tag: Tag cesty
@@ -417,29 +430,42 @@ cs:
           atm: Bankomat
           bank: Banka
           bench: Lavička
+          bicycle_parking: Parkoviště pro kola
           bicycle_rental: Půjčovna kol
+          brothel: Nevěstinec
+          bureau_de_change: Směnárna
           bus_station: Autobusové nádraží
           cafe: Kavárna
+          car_wash: Automyčka
           cinema: Kino
           courthouse: Soud
           crematorium: Krematorium
           dentist: Zubař
+          doctors: Lékař
+          dormitory: Kolej
           drinking_water: Pitná voda
           driving_school: Autoškola
           embassy: Velvyslanectví
+          fast_food: Rychlé občerstvení
           ferry_terminal: Přístaviště přívozu
+          fire_hydrant: Požární hydrant
           fire_station: Hasičská stanice
           fountain: Fontána
           fuel: Čerpací stanice
           grave_yard: Hřbitov
+          health_centre: Zdravotní středisko
           hospital: Nemocnice
           hotel: Hotel
           hunting_stand: Posed
+          ice_cream: Zmrzlinárna
           kindergarten: Mateřská škola
           library: Knihovna
+          marketplace: Tržiště
           mountain_rescue: Horská služba
+          nursing_home: Pečovatelský dům
           park: Park
           parking: Parkoviště
+          pharmacy: Lékárna
           place_of_worship: Náboženský objekt
           police: Policie
           post_box: Poštovní schránka
@@ -447,26 +473,39 @@ cs:
           prison: Věznice
           pub: Hospoda
           public_building: Veřejná budova
+          recycling: Tříděný odpad
           restaurant: Restaurace
           retirement_home: Domov důchodců
           school: Škola
+          shelter: Přístřeší
+          studio: Studio
           telephone: Telefonní automat
           theatre: Divadlo
           toilets: Toalety
           townhall: Radnice
+          vending_machine: Prodejní automat
           veterinary: Veterinární ordinace
+          waste_basket: Odpadkový koš
         boundary: 
           administrative: Administrativní hranice
         building: 
+          church: Kostel
           city_hall: Radnice
+          dormitory: Kolej
           entrance: Vstup do objektu
+          garage: Garáž
           hospital: Nemocniční budova
+          industrial: Průmyslová budova
+          office: Kancelářská budova
           public: Veřejná budova
+          school: Školní budova
           stadium: Stadion
           tower: Věž
           train_station: Železniční stanice
+          university: Univerzitní budova
           "yes": Budova
         highway: 
+          bridleway: Koňská stezka
           bus_guideway: Autobusová dráha
           bus_stop: Autobusová zastávka
           construction: Silnice ve výstavbě
@@ -476,12 +515,16 @@ cs:
           ford: Brod
           gate: Brána
           living_street: Obytná zóna
+          minor: Vedlejší silnice
           motorway: Dálnice
           motorway_junction: Dálniční křižovatka
           motorway_link: Dálnice
+          path: Pěšina
+          pedestrian: Pěší zóna
           platform: Nástupiště
           primary: Silnice první třídy
           primary_link: Silnice první třídy
+          raceway: Závodní dráha
           residential: Ulice
           secondary: Silnice druhé třídy
           secondary_link: Silnice druhé třídy
@@ -489,23 +532,35 @@ cs:
           services: Dálniční odpočívadlo
           steps: Schody
           tertiary: Silnice třetí třídy
+          track: Cesta
           trunk: Významná silnice
           trunk_link: Významná silnice
+          unclassified: Silnice
           unsurfaced: Nezpevněná cesta
         historic: 
+          archaeological_site: Archeologické naleziště
           battlefield: Bojiště
+          boundary_stone: Hraniční kámen
           building: Budova
           memorial: Památník
           museum: Muzeum
+          ruins: Zřícenina
+          wayside_shrine: Boží muka
           wreck: Vrak
         landuse: 
           allotments: Zahrádkářská kolonie
           cemetery: Hřbitov
+          conservation: Chráněné území
           construction: Staveniště
           landfill: Skládka
           military: Vojenský prostor
+          mountain: Hory
           piste: Sjezdovka
+          quarry: Lom
+          reservoir: Zásobník na vodu
+          residential: Rezidenční oblast
           vineyard: Vinice
+          wetland: Mokřad
         leisure: 
           garden: Zahrada
           golf_course: Golfové hřiště
@@ -527,6 +582,7 @@ cs:
           cave_entrance: Vstup do jeskyně
           cliff: Útes
           coastline: Pobřežní čára
+          crater: Kráter
           fell: See http://wiki.openstreetmap.org/wiki/Tag:natural=fell
           fjord: Fjord
           geyser: Gejzír
@@ -569,31 +625,56 @@ cs:
           town: Město
           village: Vesnice
         railway: 
+          abandoned: Zrušená železniční trať
+          construction: Železnice ve výstavbě
+          disused: Nepoužívaná železniční trať
+          disused_station: Nepoužívaná železniční stanice
           funicular: Lanová dráha
           halt: Železniční zastávka
+          junction: Kolejové rozvětvení
           level_crossing: Železniční přejezd
           light_rail: Rychlodráha
           monorail: Monorail
           narrow_gauge: Úzkorozchodná dráha
+          platform: Železniční nástupiště
+          preserved: Historická železnice
           spur: Železniční vlečka
+          station: Železniční stanice
           subway: Stanice metra
           subway_entrance: Vstup do metra
+          switch: Výhybka
           tram: Tramvajová trať
           tram_stop: Tramvajová zastávka
         shop: 
           bakery: Pekařství
+          bicycle: Cykloobchod
+          books: Knihkupectví
+          butcher: Řeznictví
+          car_repair: Autoservis
+          carpet: Obchod s koberci
+          copyshop: Copycentrum
+          dry_cleaning: Chemická čistírna
+          estate_agent: Realitní kancelář
+          fish: Rybárna
+          florist: Květinářství
+          food: Potraviny
+          funeral_directors: Pohřební služba
           hairdresser: Kadeřnictví
           jewelry: Klenotnictví
+          laundry: Prádelna
           optician: Oční optika
+          outdoor: Outdoorový obchod
+          shoes: Obuvnictví
           toys: Hračkářství
           travel_agency: Cestovní kancelář
+          wine: Vinárna
         tourism: 
           alpine_hut: Vysokohorská chata
           artwork: Umělecké dílo
           attraction: Turistická atrakce
           camp_site: Tábořiště, kemp
           caravan_site: Autokemping
-          chalet: Velká chata
+          chalet: Chalupa
           guest_house: Penzion
           hostel: Hostel
           hotel: Hotel
@@ -607,13 +688,20 @@ cs:
           viewpoint: Místo s dobrým výhledem
           zoo: Zoo
         waterway: 
+          boatyard: Loděnice
+          canal: Kanál
+          dam: Přehrada
           derelict_canal: Opuštěný kanál
+          ditch: Meliorační kanál
           lock: Zdymadlo
           lock_gate: Vrata plavební komory
+          rapids: Peřeje
           river: Řeka
           riverbank: Břeh řeky
+          stream: Potok
           wadi: Vádí
           waterfall: Vodopád
+          weir: Jez
   javascripts: 
     map: 
       base: 
@@ -628,6 +716,8 @@ cs:
       history_zoom_alert: Zobrazit editace této oblasti můžete jen ve větším přiblížení
   layouts: 
     copyright: Copyright &amp; licence
+    donate: Podpořte OpenStreetMap {{link}} Fondu na upgrady hardwaru
+    donate_link_text: příspěvkem
     edit: Upravit
     export: Export
     export_tooltip: Exportovat mapová data
@@ -757,27 +847,89 @@ cs:
     sent_message_summary: 
       delete_button: Smazat
   notifier: 
+    diary_comment_notification: 
+      footer: Také si můžete komentář přečíst na {{readurl}}, komentovat na {{commenturl}} nebo odpovědět na {{replyurl}}
+      header: "{{from_user}} okomentoval váš nedávný záznam v deníčku na OpenStreetMap s předmětem {{subject}}:"
+      hi: Ahoj, uživateli {{to_user}},
+      subject: "[OpenStreetMap] {{user}} okomentoval váš deníčkový záznam"
     email_confirm: 
       subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy"
+    email_confirm_html: 
+      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz.
+      greeting: Ahoj,
+      hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru {{server_url}} na {{new_address}}.
     email_confirm_plain: 
-      greeting: Dobrý den,
+      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz.
+      greeting: Ahoj,
+      hopefully_you_1: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru
+      hopefully_you_2: "{{server_url}} na {{new_address}}."
     friend_notification: 
       befriend_them: Můžete si ho/ji také přidat jako přítele na {{befriendurl}}.
       had_added_you: "{{user}} si vás na OpenStreetMap přidal(a) jako přítele."
       see_their_profile: Jeho/její profil si můžete prohlédnout na {{userurl}}.
       subject: "[OpenStreetMap] {{user}} si vás přidal jako přítele"
+    gpx_notification: 
+      and_no_tags: a bez štítků
+      and_the_tags: "a následujícími štítky:"
+      failure: 
+        failed_to_import: "se nepodařilo nahrát. Chybové hlášení následuje:"
+        more_info_1: Další informace o chybách při importu GPX a rady, jak se
+        more_info_2: "jim vyhnout, naleznete na:"
+        subject: "[OpenStreetMap] Neúspěšný import GPX"
+      greeting: Ahoj,
+      success: 
+        loaded_successfully: se úspěšně nahrál s {{trace_points}} z možných {{possible_points}} bodů.
+        subject: "[OpenStreetMap] Úspěšný import GPX"
+      with_description: s popisem
+      your_gpx_file: Vypadá to, že váš GPX soubor
     lost_password: 
       subject: "[OpenStreetMap] Žádost o nové heslo"
     lost_password_html: 
       click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové heslo.
+      greeting: Ahoj,
       hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele serveru openstreetmap.org s touto e-mailovou adresou.
+    lost_password_plain: 
+      click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové heslo.
+      greeting: Ahoj,
+      hopefully_you_1: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele
+      hopefully_you_2: serveru openstreetmap.org s touto e-mailovou adresou.
     message_notification: 
       footer1: Také si můžete zprávu přečíst na {{readurl}}
       footer2: a můžete odpovědět na {{replyurl}}
       header: "{{from_user}} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem {{subject}}:"
       hi: Dobrý den, uživateli {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy"
+    signup_confirm_html: 
+      ask_questions: Libovolné otázky k OpenStreetMap můžete klást na našem <a href="http://help.openstreetmap.org/">webu otázek a odpovědí</a>.
+      click_the_link: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte svůj účet, níže se dozvíte další informace o OpenStreetMap.
+      current_user: Seznam existujících uživatelů v kategoriích podle místa bydliště je dostupný v <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">kategorii Users by geographical region</a>.
+      get_reading: Přečtěte si něco o OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Cz:Beginners_Guide">na wiki</a>, sledujte aktuální dění na našem <a href="http://blog.openstreetmap.org/">blogu</a> či <a href="http://twitter.com/openstreetmap">Twitteru</a> nebo si projděte blog zakladatele OpenStreetMap Steva Coasta <a href="http://www.opengeodata.org/">OpenGeoData</a> se stručnou historií projektu i ve formě <a href="http://www.opengeodata.org/?cat=13">podcastů</a>!
+      greeting: Ahoj!
+      hopefully_you: Někdo (snad vy) si chce založit účet na
+      introductory_video: Můžete si prohlédnout {{introductory_video_link}}.
+      more_videos: Máme i {{more_videos_link}}.
+      more_videos_here: další videa
+      user_wiki_page: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které kategoriemi označíte, odkud pocházíte, například <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Praha">[[Category:Users in Praha]]</a>.
+      video_to_openstreetmap: úvodní video k OpenStreetMap
+      wiki_signup: Také se můžete chtít <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Cz:Main_Page&uselang=cs">zaregistrovat na OpenStreetMap wiki</a>.
     signup_confirm_plain: 
+      ask_questions: "Libovolné otázky k OpenStreetMap můžete klást na našem webu otázek a odpovědí:"
+      blog_and_twitter: "Sledujte aktuální dění na našem blogu či Twitteru:"
+      click_the_link_1: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte
+      click_the_link_2: svůj účet, níže se dozvíte další informace o OpenStreetMap.
+      current_user_1: Seznam existujících uživatelů v kategoriích podle místa bydliště
+      current_user_2: "je dostupný na:"
+      greeting: Ahoj!
+      hopefully_you: Někdo (snad vy) si chce založit účet na
+      introductory_video: "Můžete si prohlédnout úvodní video k OpenStreetMap:"
+      more_videos: "Další videa najdete na:"
+      opengeodata: "OpenGeoData.org je blog zakladatele OpenStreetMap Steva Coasta, nabízí i podcasty:"
+      the_wiki: "Přečtěte si něco o OpenStreetMap na wiki:"
       the_wiki_url: http://wiki.openstreetmap.org/wiki/Cs:Beginners_Guide?uselang=cs
+      user_wiki_1: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které
+      user_wiki_2: kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]].
+      wiki_signup: "Také se můžete chtít zaregistrovat na OpenStreetMap wiki:"
       wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Cs:Main_Page&uselang=cs
   oauth: 
     oauthorize: 
@@ -1078,7 +1230,14 @@ cs:
       title: Upravit účet
       update home location on click: Upravit pozici domova při kliknutí na mapu?
     confirm: 
+      already active: Tento uživatelský účet už byl potvrzen.
+      before you start: Víme, že se asi nemůžete dočkat, až začnete mapovat, ale předtím byste mohli chtít v následujícím formuláři vyplnit několik informaci o sobě.
       button: Potvrdit
+      heading: Potvrzení uživatelského účtu
+      press confirm button: Svůj účet aktivujte stisknutím níže zobrazeného tlačítka.
+      reconfirm: Pokud již od registrace uběhl nějaký čas, možná si budete muset <a href="{{reconfirm}}">nechat poslat nový potvrzovací e-mail</a>.
+      success: Účet potvrzen, děkujeme za registraci!
+      unknown token: Zadaný potvrzovací kód neexistuje.
     confirm_email: 
       button: Potvrdit
       failure: Tento kód byl už pro potvrzení e-mailové adresy použit.
@@ -1086,11 +1245,15 @@ cs:
       press confirm button: Pro potvrzení nové e-mailové adresy klikněte na níže zobrazené tlačítko.
       success: Vaše e-mailová adresa byla potvrzena, děkujeme za registraci!
     confirm_resend: 
+      failure: Uživatel {{name}} neexistuje.
       success: Poslali jsme na {{email}} novou potvrzovací zprávu, jakmile potvrdíte svůj účet, budete moci začít tvořit mapy.<br /><br />Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboť na žádosti o potvrzení nejsme schopni reagovat.
     filter: 
       not_an_administrator: K provedení této akce musíte být správce.
     list: 
       heading: Uživatelé
+      showing: 
+        one: Zobrazuje se stránka {{page}} ({{first_item}} z {{items}})
+        other: Zobrazuje se stránka {{page}} ({{first_item}}–{{last_item}} z {{items}})
       title: Uživatelé
     login: 
       account not active: Je mi líto, ale váš uživatelský účet dosud nebyl aktivován.<br />Svůj účet si můžete aktivovat kliknutím na odkaz v potvrzovacím e-mailu, případně si <a href="{{reconfirm}}">nechte poslat nový potvrzovací e-mail</a>.
index 6b2d7b18539bf2a0b06478b29e0bd0887c88087f..d8f0cc207bbd2e3fe45de5b956d1c496ed5a30b7 100644 (file)
@@ -10,6 +10,8 @@
 # Author: CygnusOlor
 # Author: Grille chompa
 # Author: Holger
+# Author: John07
+# Author: Katpatuka
 # Author: Kghbln
 # Author: Markobr
 # Author: McDutchie
@@ -366,6 +368,17 @@ de:
       save_button: Speichern
       title: "{{user}}s Blog | {{title}}"
       user_title: "{{user}}s Blog"
+  editor: 
+    default: Standard (derzeit {{name}})
+    josm: 
+      description: JOSM (per ferngesteuertem Plugin)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (im Browser eingebetteter Editor)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (im Browser eingebetteter Editor)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Markierung zur Karte hinzufügen
@@ -478,7 +491,7 @@ de:
           ferry_terminal: Fähren-Anlaufstelle
           fire_hydrant: Hydrant
           fire_station: Feuerwehr
-          fountain: Brunnen
+          fountain: Springbrunnen
           fuel: Tankstelle
           grave_yard: Friedhof
           gym: Fitness-Zentrum
@@ -527,7 +540,7 @@ de:
           toilets: WC
           townhall: Rathaus
           university: Universität
-          vending_machine: Automat
+          vending_machine: Selbstbedienungsautomat
           veterinary: Tierarzt
           village_hall: Gemeindezentrum
           waste_basket: Mülleimer
@@ -893,6 +906,7 @@ de:
     donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene {{link}}.
     donate_link_text: Spende
     edit: Bearbeiten
+    edit_with: Bearbeiten mit {{editor}}
     export: Export
     export_tooltip: Kartendaten exportieren
     gps_traces: GPS-Tracks
@@ -1075,13 +1089,13 @@ de:
       ask_questions: Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit <a href="http://help.openstreetmap.org/">Fragen und Antworten</a> stellen.
       click_the_link: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM.
       current_user: Ebenso ist <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">eine Liste mit allen Benutzern in einer Kategorie</a>, die anzeigt wo diese auf der Welt sind, verfügbar.
-      get_reading: Weitere Informationen über OpenStreetMap findest du in <a href="http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide">unserem Wiki</a>, informiere dich über die neusten Nachrichten über das <a href="http://blog.openstreetmap.org/">OpenStreetMap-Blog</a> oder <a href="http://twitter.com/openstreetmap">Twitter</a>, oder besuche das <a href="http://www.opengeodata.org/">OpenGeoData-Blog</a> von OpenStreetMap-Gründer Steve Coast für die gekürzte Geschichte des Projektes, dort werden auch <a href="http://www.opengeodata.org/?cat=13">Podcasts zum Hören</a> angeboten.
+      get_reading: Auf <a href="http://www.openstreetmap.de/willkommen/">dieser Seite findest du einige nützliche Links und Informationen</a>, die dir den Einstieg erleichtern werden.
       greeting: Hallo!
       hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für
       introductory_video: Du kannst dir das {{introductory_video_link}} anschauen.
       more_videos: Darüber hinaus gibt es noch viele weitere {{more_videos_link}}.
       more_videos_here: Videos über OpenStreetMap
-      user_wiki_page: Es wird begrüßt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_München">[[Category:Users_in_München]]</a>.
+      user_wiki_page: Es wird begrüßt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_Berlin">[[Category:Users_in_Berlin]]</a>.
       video_to_openstreetmap: Einführungsvideo zu OpenStreetMap
       wiki_signup: Im <a href="http://wiki.openstreetmap.org/wiki/Hauptseite">Wiki von OpenStreetMap</a> kannst du dich ebenfalls <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup">registrieren</a>.
     signup_confirm_plain: 
@@ -1173,11 +1187,13 @@ de:
     edit: 
       anon_edits_link_text: Hier findest du mehr Infos dazu.
       flash_player_required: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor zu benutzen. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lade den Flash Player von Adobe.com herunter</a>. <a href="http://wiki.openstreetmap.org/wiki/DE:Editing">Einige andere Möglichkeiten</a>, um OpenStreetMap zu editieren, sind hier beschrieben.
+      no_iframe_support: Der Browser unterstützt keine HTML-Inlineframes (iframes), die zur Nutzung dieser Funktion unabdingbar sind.
       not_public: Deine Einstellungen sind auf anonymes Bearbeiten gestellt.
       not_public_description: Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner {{user_page}} tun.
       potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere den Weg oder Punkt, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.)
       user_page_link: Benutzerseite
     index: 
+      josm_failed: Das Bearbeiten ist fehlgeschlagen. Stelle sicher, dass JOSM geladen wird und das Plugin zur Fernsteuerung aktiviert ist.
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
       js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung.
       js_3: Solltest bei dir kein JavaScript möglich sein, kannst du auf der <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home Website</a> eine Version ohne JavaScript benutzen.
@@ -1394,6 +1410,7 @@ de:
       new email address: "Neue E-Mail Adresse:"
       new image: Bild einfügen
       no home location: Du hast noch keinen Standort angegeben.
+      preferred editor: "Bevorzugten Editor:"
       preferred languages: "Bevorzugte Sprachen:"
       profile description: "Profil-Beschreibung:"
       public editing: 
@@ -1418,7 +1435,7 @@ de:
       heading: Benutzerkonto bestätigen
       press confirm button: Benutzerkonto aktivieren, indem du auf den Bestätigungsbutton klickst.
       reconfirm: Sofern seit deiner Registrierung schon etwas Zeit vergangen ist, musst du gegebenenfalls selber <a href="{{reconfirm}}">eine neue Bestätigungs-E-Mail senden</a>.
-      success: Dein Benutzeraccount wurde bestätigt, danke fürs Registrieren!
+      success: "Dein Benutzerkonto wurde bestätigt, danke fürs Registrieren!\n<br /><br />\nAuf <a href=\"http://www.openstreetmap.de/willkommen/\">dieser Seite</a> findest du nützliche Links und Informationen, die dir den Einstieg erleichtern."
       unknown token: Dieser Token scheint nicht zu existieren.
     confirm_email: 
       button: Bestätigen
@@ -1486,7 +1503,7 @@ de:
       fill_form: Fülle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt.
       flash create success message: "\nVielen Dank für deine Registrierung. Wir haben eine Bestätigungsnachricht an {{email}} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.<br /><br />Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du <webmaster@openstreetmap.org> auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können."
       heading: Ein Benutzerkonto erstellen
-      license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedigungen für Mitwirkende</a> zustimmen.
+      license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedingungen für Mitwirkende</a> zustimmen.
       no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich.
       not displayed publicly: Nicht öffentlich sichtbar (<a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>)
       password: "Passwort:"
index 71f49474df936d817ed2a3dfe31b0ae38bc14641..1f0929b5b89fbe5a940a377d3b393ed22b331e91 100644 (file)
@@ -359,6 +359,17 @@ dsb:
       save_button: Składowaś
       title: Dnjownik {{user}} | {{title}}
       user_title: dnjownik wužywarja {{user}}
+  editor: 
+    default: Standard (tuchylu {{name}})
+    josm: 
+      description: JOSM (tykac za zdalokawóźenje)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (editor za wobźěłowanje we wobglědowaku)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor za wobźěłowanje we wobglědowaku)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Kórśe marku pśidaś
@@ -886,10 +897,14 @@ dsb:
     donate: Pódprěj OpenStreetMap pśez {{link}} do fondsa aktualizacije hardware
     donate_link_text: dar
     edit: Wobźěłaś
+    edit_with: Z {{editor}} wobźěłaś
     export: Eksport
     export_tooltip: Kórtowe daty eksportěrowaś
     gps_traces: GPS-slědy
     gps_traces_tooltip: GPS-slědy zastojaś
+    help: Pomoc
+    help_and_wiki: "{{help}} + {{wiki}}"
+    help_title: Sedło pomocy za projekt
     history: Historija
     home: domoj
     home_tooltip: K stojnišćoju
@@ -930,6 +945,8 @@ dsb:
     view_tooltip: Kórtu se woglědaś
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twój wužywarski bok
+    wiki: Wiki
+    wiki_title: Wikisedło za projekt
   license_page: 
     foreign: 
       english_link: engelskim originalom
@@ -1062,6 +1079,7 @@ dsb:
     signup_confirm: 
       subject: "[OpenStreetMap] Twóju e-mailowu adresu wobkšuśiś"
     signup_confirm_html: 
+      ask_questions: Móžoš se za něcym wó OpenStreetMap na našom sedle <a href="http://help.openstreetmap.org/">Pšašanja a wótegrona</a> pšašaś.
       click_the_link: Jolic ty to sy, witaj! Klikni pšosym dołojce na wótkaz, aby wobkšuśił toś to konto a cytaj dalej za dalšne informacije wo OpenStreetMap
       current_user: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe stoj pód <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a> k dispoziciji.
       get_reading: Dalšne informacije wó OpenStreetMap namakajoš <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na wikiju</a>, zastaraj se z nejnowšymi powěsćami pśez <a href="http://blog.openstreetmap.org/">blog OpenStreetMap</a> abo <a href="http://twitter.com/openstreetmap">Twitter</a>, abo pśecytaj <a href="http://www.opengeodata.org/">blog 0penGeoData</a> załožarja OpenStreetMap Steve Coast za historiju projekta, kótaryž ma teke <a href="http://www.opengeodata.org/?cat=13">podkasty</a>!
@@ -1074,6 +1092,7 @@ dsb:
       video_to_openstreetmap: zapokazańske wideo wó OpenStreetMap
       wiki_signup: Móžoš se teke <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">na wikiju OpenStreetMap registrěrowaś</a>.
     signup_confirm_plain: 
+      ask_questions: "Móžoš se za něcym wó OpenStreetMap  na našom sedle Pšašanja a wótegrona pšašaś:"
       blog_and_twitter: "Zastaraj se z nejnowšymi powěsćami pśez blog OpenStreetMap abo Twitter:"
       click_the_link_1: Jolic ty to sy, witaj! Pšosym klikni dołojce na wótkaz, aby wobkšuśił swójo
       click_the_link_2: konto a cytaj dalej za dalšne informacije wo OpenStreetMap.
@@ -1159,11 +1178,13 @@ dsb:
     edit: 
       anon_edits_link_text: Wuslěź, cogodla tomu tak jo.
       flash_player_required: Trjebaš wótegrajadło Flash, aby wužywał Potlatch, editor Flash OpenStreetMap. Móžoš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wótegrajadło Flash z Adobe.com ześěgnuś</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotare druge móžnosći</a> stoje teke za wobźěłowanje OpenStreetMap k dispoziciji.
+      no_iframe_support: Twój wobglědowak njepódpěrujo HTML-elementy iframe, kótarež su trěbne za toś tu funkciju.
       not_public: Njejsy swóje změny ako zjawne markěrował.
       not_public_description: Njamóžoš wěcej kórtu wobzěłaś, snaźkuli cyniś to rowno. Móžoš swóje změny na swójom {{user_page}} ako zjawne markěrowaś.
       potlatch_unsaved_changes: Maš njeskłaźone změny. (Aby składował w Potlatch, ty by dejał aktualny puś abo dypk wótwóliś, jolic wobźěłujoš w livemodusu, abo klikni na Składowaś, jolic maš tłocašk Składowaś.)
       user_page_link: wužywarskem boku
     index: 
+      josm_failed: Wobźěłowanje jo se njeraźiło - pśeznań se, lěc JOSM jo zacytany a tykac za zdalokawóźenje jo zmóžnjony
       js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił JavaScript.
       js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu.
       js_3: Móžoš teke <a href="http://tah.openstreetmap.org/Browse/">statiski kachlowy wobglědowak Tiles@Home</a> wužywaś, jolic njamóžoš JavaScript zmóžniś.
@@ -1175,7 +1196,7 @@ dsb:
       shortlink: Krotki wótkaz
     key: 
       map_key: Legenda
-      map_key_tooltip: Legenda za kórtu Mapnik na toś tom skalěrowańskem měritku
+      map_key_tooltip: Legenda za kórtu
       table: 
         entry: 
           admin: Zastojnstwowa granica
@@ -1379,6 +1400,7 @@ dsb:
       new email address: "Nowa e-mailowa adresa:"
       new image: Wobraz pśidaś
       no home location: Njejsy swóje bydlišćo zapódał.
+      preferred editor: "Preferěrowany editor :"
       preferred languages: "Preferěrowane rěcy:"
       profile description: "Profilowe wopisanje:"
       public editing: 
@@ -1397,16 +1419,23 @@ dsb:
       title: Konto wobźěłaś
       update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś?
     confirm: 
+      already active: Toś te konto jo se južo wobkšuśiło.
+      before you start: Wěmy, až nejskerjej njamóžoš docakaś kartěrowanje zachopiś, ale ty by měł nejpjerwjej někotare informacije wó sebje w slědujucem formularje pódaś.
       button: Wobkšuśiś
       heading: Wužywarske konto wobkšuśiś
       press confirm button: Klikni dołojce na wobkšuśeński tłocašk, aby aktiwěrował swójo konto.
+      reconfirm: Jolic jo se južo něco casa minuło, wót togo casa ako sy se zregistrěrował, musyš ewentuelnje sam <a href="{{reconfirm}}">nowu wobkšuśeńsku e-mail pósłaś</a>.
       success: Twójo konto jo se wobkšuśiło, źěkujomy se za registrěrowanje!
+      unknown token: Zda se, až token njeeksistěrujo.
     confirm_email: 
       button: Wobkšuśiś
       failure: E-mailowa adresa jo se južo wobkšuśiła pśez toś ten wótkaz.
       heading: Změnjenje e-mailoweje adrese wobkšuśiś
       press confirm button: Klikni na wobkšuśeński tłocašk, aby swóju nowu e-mailowu adresu wobkšuśił.
       success: Twója e-mailowa adresa jo se wobkšuśiła, źěkujomy se za registrěrowanje!
+    confirm_resend: 
+      failure: Wuzywaŕ {{name}} njejo se namakał.
+      success: Smy nowu wobkšuśeński e-mail na {{email}} póslali a gaž wobkšuśijoš swójo konto, móžoš kartěrowanje zachopiś.<br /><br />Jolic wužywaš pśeśiwospamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
     filter: 
       not_an_administrator: Musyš administrator byś, aby wuwjadł toś tu akciju.
     go_public: 
@@ -1423,7 +1452,7 @@ dsb:
       summary_no_ip: "{{name}} dnja {{date}} napórany"
       title: Wužywarje
     login: 
-      account not active: Bóžko, twojo konto hyšći njejo aktiwne.<br />Pšosym klikni na wótkaz w e-mailu za wobkšuśenje konta, aby aktiwěrował swójo konto.
+      account not active: Bóžko twojo konto hyšći njejo aktiwne.<br />Pšosym klikni na wótkaz w e-mailu za wobkšuśenje konta, aby aktiwěrował swójo konto abo <a href="{{reconfirm}}">pominaj nowu wobkšuśeńsku e-mail</a>.
       account suspended: Twójo konto jo se bóžko wupowěźeło dla pódglědneje aktiwity.<br />Staj se z {{webmaster}}, jolic coš wó tom diskutěrowaś.
       auth failure: Bóžko, pśizjawjenje z toś tymi datami njejo móžno.
       create_account: załož konto
@@ -1462,7 +1491,7 @@ dsb:
       display name description: Sy wužywarske mě zjawnje pokazał. Móžoš to pózdźej w nastajenjach změniś.
       email address: "E-mailowa adresa:"
       fill_form: Wupołni formular a pósćelomy śi krotku e-mail za aktiwěrowanje twójogo konta.
-      flash create success message: Wužywarske konto jo se wuspěšnje załožyło. Pśeglědaj swóju e-mail za wobkšuśeńskim wótkazom a móžoš ned zachopiś kartěrowaś :-)<br /><br />Pšosym spomni na to, až njamóžoš se pśizjawiś, až njejsy swóju e-mailowu adresu dostał a wobkšuśił.<br /><br />Jolic wužywaš antispamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, ga zawěsć, až webmaster@openstreetmap.org jo w twójej běłej lisćinje, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
+      flash create success message: Źěkujomy se za registrěrowanje. Smy wobkšuśeński e-mail na {{email}} póslali a gaž wobkšuśijoš swójo konto, móžoš kartěrowanje zachopiś.<br /><br />Jolic wužywaš pśeśiwospamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś.
       heading: Wužywarske konto załožyś
       license_agreement: Z wobkšuśenim twójogo konta dejš <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">wuměnjenjam pśinosowarjow</a> pśigłosowaś.
       no_auto_account_create: Bóžko njamóžomy tuchylu za tebje konto awtomatiski załožyś.
index ebd53720b32b0852e2188cdb2d7b725c537df78d..72d111f8a4b76515ac374d1bf10dbbdba6977b31 100644 (file)
@@ -79,6 +79,17 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
+  editor:
+    default: "Default (currently {{name}})"
+    potlatch:
+      name: "Potlatch 1"
+      description: "Potlatch 1 (in-browser editor)"
+    potlatch2:
+      name: "Potlatch 2"
+      description: "Potlatch 2 (in-browser editor)"
+    remote:
+      name: "Remote Control"
+      description: "Remote Control (JOSM or Merkaartor)"
   browse:
     changeset:
       title: "Changeset"
@@ -912,6 +923,7 @@ en:
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
+    edit_with: Edit with {{editor}}
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
@@ -1226,6 +1238,7 @@ en:
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
+      remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -1235,6 +1248,8 @@ en:
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
+      potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
       close: Close
@@ -1682,6 +1697,7 @@ en:
         link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
+      preferred editor: "Preferred Editor:"
       image: "Image:"
       new image: "Add an image"
       keep image: "Keep the current image"
index 0f970e51fa836806c9f645ff3980264ffaa8cd32..c913e2a15023404785b3bbe2ff30bbbcceeef2d1 100644 (file)
@@ -5,6 +5,7 @@
 # Author: Lucas
 # Author: LyzTyphone
 # Author: Michawiki
+# Author: Petrus Adamus
 # Author: Yekrats
 eo: 
   activerecord: 
@@ -280,7 +281,7 @@ eo:
       format_to_export: Formato por Eksportado
       image_size: Bildamplekso
       latitude: "Lat:"
-      licence: Licenco
+      licence: Permesilo
       longitude: "Lon:"
       manually_select: Mane elekti alian aeron.
       mapnik_image: Mapnik Bildo
@@ -354,7 +355,7 @@ eo:
       other: Via leterkesto enhavas {{count}} nelegitajn mesaĝojn
       zero: Via leterkesto ne enhavas nelegitajn mesaĝojn
     license: 
-      title: Datumoj de OpenStreetMap estas licencataj sub la Ĝenerala Licenco de Commons Attribution-Share Alike 2.0
+      title: Datenoj de OpenStreetMap estas disponeblaj laŭ la permesilo Krea Komunaĵo Atribuite-Samkondiĉe 2.0 Ĝenerala
     log_in: ensaluti
     log_in_tooltip: Ensaluti kun ekzistanta konto
     logo: 
index 70937ab5cadbbc6d2cc8f83a716ff79182a09f60..1e9c2c1265f6d484e37976114a265ddb7bd5e719 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Crazymadlover
+# Author: Locos epraix
 # Author: McDutchie
 # Author: PerroVerd
 # Author: Peter17
@@ -1397,6 +1398,7 @@ es:
       title: Editar cuenta
       update home location on click: ¿Actualizar tu lugar de origen cuando pulses sobre el mapa?
     confirm: 
+      already active: Esta cuenta ya ha sido confirmada.
       button: Confirmar
       heading: Confirmar la cuenta de usuario
       press confirm button: Pulse botón de confirmación de abajo para activar su cuenta.
@@ -1407,6 +1409,8 @@ es:
       heading: Confirmar el cambio de dirección de correo electrónico
       press confirm button: Pulse botón de confirmación de debajo para confirmar su nueva dirección de correo
       success: Dirección de correo electrónico confirmada. ¡Gracias por registrarse!
+    confirm_resend: 
+      failure: No se ha encontrado el usuario {{name}}
     filter: 
       not_an_administrator: Necesitas ser administrador para ejecutar esta acción.
     go_public: 
index 0267cb4c162d09ecfc5e16d7edbffcfbd10d0730..7519708ac7be6ae72debb65e2cacf0cb6b1e675b 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Avjoska
+# Author: Kanne
 et: 
   activerecord: 
     attributes: 
@@ -32,14 +33,38 @@ et:
       language: Keel
   browse: 
     map: 
-      deleted: Kustutatud
+      deleted: kustutatud
+    navigation: 
+      all: 
+        next_node_tooltip: Järgmine sõlm
+        next_relation_tooltip: Järgmine relatsioon
+        prev_node_tooltip: Eelmine sõlm
+        prev_way_tooltip: Eelmine joon
+      user: 
+        prev_changeset_tooltip: Kasutaja {{user}} eelmine muudatus
     node: 
       edit: redigeeri
+      node: sõlm
       view_history: vaata redigeerimiste ajalugu
     node_details: 
-      coordinates: "Koordinaadid:"
+      coordinates: "koordinaadid:"
+    not_found: 
+      type: 
+        node: sõlm
+        relation: relatsioon
+        way: joon
+    relation: 
+      download: "{{download_xml_link}} või {{view_history_link}}"
+      relation: relatsioon
+      relation_title: "Relatsioon: {{relation_name}}"
     relation_details: 
       members: "Liikmed:"
+    relation_member: 
+      entry_role: "{{type}} {{name}} kui {{role}}"
+      type: 
+        node: Sõlm
+        relation: relatsioon
+        way: joon
     start_rjs: 
       details: Detailid
       object_list: 
@@ -47,11 +72,19 @@ et:
       show_history: Näita ajalugu
       wait: Oota...
     way: 
+      download: "{{download_xml_link}}, {{view_history_link}} või {{edit_link}}"
+      download_xml: Lae XML
       edit: redigeeri
       view_history: vaata ajalugu
+    way_details: 
+      nodes: "Sõlmed:"
+      part_of: "Osa:"
     way_history: 
+      download_xml: Lae alla XML-fail.
       view_details: vaata detaile
   changeset: 
+    changeset_paging_nav: 
+      previous: "&laquo; Eelmine"
     changesets: 
       comment: Kommentaar
   diary_entry: 
@@ -61,6 +94,12 @@ et:
       subject: "Teema:"
     list: 
       title: Kasutajate päevikud
+    location: 
+      edit: muuda
+    no_such_user: 
+      heading: Kasutajat {{user}} ei ole olemas
+    view: 
+      login: Logi sisse
   geocoder: 
     direction: 
       east: ida
@@ -161,11 +200,11 @@ et:
           golf_course: Golfiväljak
           ice_rink: Uisuväli
           miniature_golf: Minigolf
-          park: Park
+          park: park
           playground: Mänguväljak
           sports_centre: Spordikeskus
           stadium: Saadion
-          swimming_pool: Ujula
+          swimming_pool: ujula
           water_park: Veepark
         natural: 
           beach: Rand
@@ -185,16 +224,18 @@ et:
           water: Vesi
           wetlands: Soo
         place: 
-          airport: Lennujaam
+          airport: lennujaam
           city: Linn
-          country: Riik
+          country: riik
           county: Maakond
-          house: Maja
+          farm: talu
+          house: maja
           houses: Majad
           island: Saar
           islet: Saareke
           municipality: Vald
           postcode: Sihtnumber
+          sea: meri
           state: Osariik
           town: Linn
           village: Küla
@@ -230,14 +271,17 @@ et:
         tourism: 
           attraction: Turismiatraktsioon
           camp_site: Laagriplats
-          guest_house: Külalistemaja
+          guest_house: külalistemaja
           hotel: Hotell
-          information: Informatsioon
-          motel: Motell
-          museum: Muuseum
-          picnic_site: Piknikuplats
+          information: informatsioon
+          motel: motell
+          museum: muuseum
+          picnic_site: piknikuplats
           theme_park: Teemapark
           zoo: Loomaaed
+  javascripts: 
+    site: 
+      edit_tooltip: Töötle kaarti
   layouts: 
     edit: Redigeeri
     log_in: logi sisse
@@ -247,10 +291,21 @@ et:
   message: 
     inbox: 
       date: Kuupäev
+      from: Saatja
+      my_inbox: Minu postkast
+      outbox: Saadetud kirjad
+      people_mapping_nearby: lähedalolevad kaardistajad
+      subject: Teema
+      title: Saabunud kirjad
+      you_have: Sul on {{new_count}} uusi sõnumeid ja {{old_count}} vanad sõnumid
+    mark: 
+      as_read: Sõnum on märgitud loetuks
+      as_unread: Sõnum on märgitud kui lugemata
     message_summary: 
       delete_button: Kustuta
       read_button: Märgi loetuks
       reply_button: Vasta
+      unread_button: Märgi mitteloetuks
     outbox: 
       date: Kuupäev
       subject: Teema
@@ -264,6 +319,8 @@ et:
     sent_message_summary: 
       delete_button: Kustuta
   notifier: 
+    diary_comment_notification: 
+      hi: Tere, {{to_user}}!
     email_confirm_html: 
       greeting: Tere,
     email_confirm_plain: 
@@ -280,6 +337,8 @@ et:
     edit: 
       submit: Redigeeri
       title: Redigeeri oma avaldust
+    form: 
+      name: Nimi
     index: 
       application: Avalduse nimi
     new: 
@@ -288,13 +347,21 @@ et:
   site: 
     edit: 
       user_page_link: kasutajaleht
+    index: 
+      license: 
+        project_name: OpenStreetMap projekt
     key: 
+      map_key: Legend
       table: 
         entry: 
           cemetery: Surnuaed
           cycleway: Jalgrattatee
           footway: Jalgtee
+          golf: Golfiväljak
           park: Park
+          station: Raudteejaam
+          tram: 
+            1: tramm
     search: 
       search: Otsi
       submit_text: Otsi
@@ -302,7 +369,12 @@ et:
     sidebar: 
       close: Sulge
       search_results: Otsingu tulemused
+  time: 
+    formats: 
+      friendly: "%e %B %Y kell %H:%M"
   trace: 
+    create: 
+      upload_trace: Laadi üles GPS-rada
     edit: 
       description: "Kirjeldus:"
       download: laadi alla
@@ -314,7 +386,7 @@ et:
       save_button: Salvesta muudatused
       start_coord: "Alguskoordinaadid:"
       visibility: "Nähtavus:"
-      visibility_help: mida see tähendab?
+      visibility_help: Mida see tähendab?
     no_such_user: 
       title: Sellist kasutajat ei ole
     trace: 
@@ -325,6 +397,8 @@ et:
       upload_button: Laadi üles
       visibility: Nähtavus
       visibility_help: mida see tähendab?
+    trace_header: 
+      upload_trace: Lisa GPS-rada
     view: 
       description: "Kirjeldus:"
       download: laadi alla
@@ -337,64 +411,150 @@ et:
       visibility: "Nähtavus:"
   user: 
     account: 
+      contributor terms: 
+        heading: "Kaastöö tingimused:"
+        link text: Mis see on?
+      current email address: "Praegune e-posti aadress:"
+      delete image: Eemalda praegune pilt
+      email never displayed publicly: (mitte kunagi näidata avalikult)
+      home location: "Kodu asukoht:"
+      image size hint: (ruudukujuline pilt vähemalt 100x100 on sobiv)
+      keep image: Säilitada praegune pilt
       latitude: "Laiuskraadid:"
       longitude: "Pikkuskraadid:"
+      new email address: "Uus e-posti aadress:"
       preferred languages: "Eelistatud keeled:"
+      profile description: "Profiili kirjeldus:"
       public editing: 
-        disabled link text: miks ma ei saa redigeerida?
-        enabled link text: mis see on?
+        disabled link text: Miks ma ei saa kaarti töödelda?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: Mis see on?
+        heading: "Avalikud seaded:"
+      public editing note: 
+        heading: Avalik toimetamine
+      replace image: Asenda praegune pilt
+      return to profile: Tagasi profiili
       save changes button: Salvesta muudatused
     confirm: 
+      already active: See konto on juba kinnitatud.
+      button: Kinnita
+      heading: Kinnita kasutajakonto
+    confirm_email: 
       button: Kinnita
+    confirm_resend: 
+      failure: Kasutaja {{nimi}} ei leitud.
+    filter: 
+      not_an_administrator: Selle tegevuse sooritamiseks pead sa olema administraator.
+    list: 
+      empty: Sobivaid kasutajaid ei leitud!
+      heading: Kasutajad
+      hide: Peida valitud Kasutajad
+      summary_no_ip: "{{nimi}} loodud {{date}}"
+      title: Kasutajad
     login: 
-      create_account: loo uus kasutajanimi
+      create_account: Loo uus kasutajanimi
       email or username: "E-posti aadress või kasutajanimi:"
       heading: Logi sisse
       login_button: Logi sisse
       password: "Parool:"
       title: Sisselogimise lehekülg
+    logout: 
+      heading: Välju OpenStreetMap -st
+      logout_button: Logi välja
+      title: Logi välja
     lost_password: 
       email address: "E-posti aadress:"
       heading: Parool ununenud?
     make_friend: 
+      already_a_friend: Sa oled kasutajaga {{name}} juba sõber.
       success: "{{name}} on nüüd Sinu sõber."
     new: 
       confirm email address: "Kinnita e-posti aadress:"
       confirm password: "Kinnita parool:"
+      continue: Jätka
+      display name: "Kuvatav nimi:"
+      display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem eelistustes.
       email address: "E-posti aadress:"
+      fill_form: Täitke vorm ning me saadame teile e-posti konto aktiveerimiseks.
       heading: Loo uus kasutajanimi
       password: "Parool:"
+      title: Loo uus konto
+    popup: 
+      friend: Sõber
+      nearby mapper: Lähedaloevad kaardistajad
+      your location: Sinu asukoht
+    remove_friend: 
+      not_a_friend: "{{name}} ei ole üks sinu sõpradest."
     reset_password: 
       confirm password: "Kinnita parool:"
       flash changed: Sinu parool on muudetud.
+      heading: Lähtesta parool kasutajale {{user}}
       password: "Parool:"
+      reset: Lähtesta parool
+      title: Lähtesta parool
+    set_home: 
+      flash success: Kodukoht edukalt salvestatud
+    terms: 
+      agree: Nõus
+      consider_pd_why: Mis see on?
+      decline: Langus
+      legale_names: 
+        france: Prantsusmaa
+        italy: Itaalia
+        rest_of_world: Muu maailm
+      legale_select: "Palun valige oma elukohariik:"
     view: 
       activate_user: aktiveeri see kasutaja
       add as friend: lisa sõbraks
+      ago: ({{time_in_words_ago}} tagasi)
+      confirm: Kinnita
       create_block: blokeeri see kasutaja
       delete_user: kustuta see kasutaja
       description: Kirjeldus
       diary: päevik
       edits: muudatused
       email address: "E-posti aadress:"
+      hide_user: peida see kasutaja
       km away: "{{count}} kilomeetri kaugusel"
       m away: "{{count}} meetri kaugusel"
+      mapper since: "Kaardistaja alates:"
       my diary: minu päevik
+      my edits: minu muutmised
+      my settings: minu seaded
+      my traces: minu jäljelogid
+      nearby users: Teised lähedal asuvad kasutajad
       new diary entry: uus päevikusissekanne
+      no friends: Sa ei ole lisanud veel ühtegi sõpra.
+      no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad läheduses.
+      oauth settings: oauth seaded
+      remove as friend: Eemalda sõprade hulgast
       role: 
         administrator: See kasutaja on administraator
         moderator: See kasutaja on moderaator
       send message: saada sõnum
+      settings_link_text: seaded
+      spam score: "Rämpsposti tulemus:"
+      status: "Staatus:"
+      traces: jäljelogid
+      user location: Kasutaja asukoht
       your friends: Sinu sõbrad
   user_block: 
     edit: 
       back: Vaata kõiki blokeeringuid
+    filter: 
+      not_a_moderator: Selle tegevuse sooritamiseks pead sa olema moderaator.
     new: 
       back: Vaata kõiki blokeeringuid
     partial: 
       confirm: Oled Sa kindel?
     show: 
+      back: Vaata kõiki blokeeringuid
       confirm: Oled Sa kindel?
+      edit: Redigeeri
+      revoker: Tühistaja
+      show: Näita
+      status: Olek
+      time_future: Lõpeb {{time}}
   user_role: 
     revoke: 
       confirm: Kinnita
index 0b41eba7bae221d54256b57ca57877bb2eb31baa..c3fe5f42332cc0a6079e06bb29a915de722e9cd4 100644 (file)
@@ -5,6 +5,7 @@
 # Author: Asieriko
 # Author: MikelEH
 # Author: PerroVerd
+# Author: Xabier Armendaritz
 eu: 
   activerecord: 
     attributes: 
@@ -608,7 +609,7 @@ eu:
           golf: Golf-zelai
           industrial: Industrialdea
           lake: 
-            - Laku
+            - Aintzira
             - urtegia
           military: Eremu militarra
           motorway: Autobidea
index 5aef0d2a6c6d661a3ac06569575a1dda8b1d6272..782776710e4734d1fca122e39534891115d22d40 100644 (file)
@@ -183,15 +183,20 @@ fi:
       view_data: Näytä tiedot nykyisestä karttanäkymästä
     start_rjs: 
       data_frame_title: Tiedot
+      data_layer_name: Data
       details: Tarkemmin
       drag_a_box: Valitse alue kartalta hiirellä maalaamalla
+      edited_by_user_at_timestamp: Viimeinen muokkaaja [[user]] kello [[timestamp]]
+      history_for_feature: Ominaisuuden [[feature]] historia
       load_data: Lataa tiedot
       loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää [[num_features]] osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle 100 osiota kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta.
       loading: Ladataan tietoja...
       manually_select: Rajaa pienempi alue käsin
       object_list: 
         api: Hae tämä alue APIsta
+        back: Näytettävien kohteiden lista
         details: Lisätiedot
+        heading: Objektiluettelo
         history: 
           type: 
             node: Piste [[id]]
@@ -209,7 +214,12 @@ fi:
       zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat
     tag_details: 
       tags: "Tägit:"
+      wiki_link: 
+        key: Wikisivu tietueelle {{key}}
+        tag: Wikisivu tietueelle {{key}}={{value}}
+      wikipedia_link: Artikkeli {{page}} Wikipediassa
     timeout: 
+      sorry: Tietojen hakeminen (kohde {{type}}:{{id}}) kesti liian kauan.
       type: 
         changeset: muutoskokoelma
         node: piste
@@ -636,6 +646,7 @@ fi:
           station: Rautatieasema
           subway: Metroasema
           subway_entrance: Metron sisäänkäynti
+          tram_stop: Raitiovaunupysäkki
           yard: Ratapiha
         shop: 
           art: Taidekauppa
@@ -723,6 +734,8 @@ fi:
     export: Vienti
     export_tooltip: Karttatiedon vienti
     gps_traces: GPS-jäljet
+    help: Ohje
+    help_and_wiki: "{{help}} ja {{wiki}}"
     history: Historia
     home: koti
     home_tooltip: Siirry kotisijaintiin
@@ -757,6 +770,18 @@ fi:
     view_tooltip: Näytä kartta
     welcome_user: Tervetuloa, {{user_link}}
     welcome_user_link_tooltip: Käyttäjäsivusi
+    wiki: Wiki
+  license_page: 
+    foreign: 
+      english_link: englanninenkielisen alkuperäisversion
+      text: Siinä tapauksessa, että tämän käännetyn sivun ja {{english_original_link}} välillä on ristiriita englanninkielinen sivu on etusijalla.
+      title: Tietoja tästä käännöksestä
+    legal_babble: "<h2>Tekijänoikeus ja lisenssi</h2>\n<p>\nOpenStreetMap on <i>avointa dataa</i>, joka on lisensoitu <a\nhref=\"http://creativecommons.org/licenses/by-sa/2.0/deed.fi/\">\nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio</a> -lisenssilllä (CC-BY-SA).\n</p>\n<p>\nVoit kopioida, levittää, välittää ja mukauttaa karttojamme\nja tietojamme, kunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">Legal codessa</a>\nkerrotaan oikeutesi ja velvollisuutesi.\n</p>\n\n\n<h3>OpenStreetMapin mainitseminen</h3>\n<p>\nJos käytät OpenStreetMapin karttakuvia, pyydämme että\nmainitset ainakin ”© OpenStreetMapin tekijät, CC-BY-SA”.\nJos käytät vain karttatietoja,\nmainitse ”Karttatiedot © OpenStreetMapin tekijät, CC-BY-SA”.\n</p>\n<p>\nAina kun se on mahdollista, linkitä OpenStreetMap osoitteeseen\n<a href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\nja CC-BY-SA osoitteeseen\n<a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>.\nJos hyperlinkit eivät ole mahdollisia (esimerkiksi\ntulostettu työ), suosittelemme, että ohjaat lukijat osoitteisiin\nwww.openstreetmap.org ja\nwww.creativecommons.org.\n</p>\n\n<h3>Lisätietoja</h3>\n<p>\nLue lisää\n<a href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">Legal FAQ:sta</a>.\n</p>\n<p>\nOSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty.\n</p>\n<p>\nVaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">APIn käyttösäännöt</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">karttakuvien käyttösäännöt</a>\n<a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">ja Nominatimin käyttösäännöt</a>.\n</p>\n\n<h3>Tekijät</h3>\n<p>\nKäyttämämme CC-BY-SA-lisenssi vaatii ”alkuperäisten tekijöiden\nmainintaa” käyttömediaan ja käyttötapaan sopivalla tavalla.\nYksittäisiä OSM-kartoittajia ei tarvitse mainita muuten kuin \nmaininnalla ”OpenStreetMapin tekijät”. Kun kyseessä on\npaikallinen maanmittauslaitos tai muu merkittävä lähde,\njonka tietoja käytetään OpenStreetMapissa, voi olla\nperusteltua nimetä myös kyseiset tahot suoraan tai viitata\nsiihen tällä sivulla.\n</p>\n\n<!--\nInformation for page editors\n\nThe following lists only those organisations who require attribution\nas a condition of their data being used in OpenStreetMap. It is not a\ngeneral catalogue of imports, and must not be used except when\nattribution is required to comply with the licence of the imported\ndata.\n\nAny additions here must be discussed with OSM sysadmins first.\n-->\n\n<ul id=\"contributors\">\n<li><strong>Australia</strong>: Sisältää lähiötietoja\nAustralian Bureau of Statisticsilta.</li>\n<li><strong>Kanada</strong>: Sisältää tietoja\nGeoBasesta ®, GeoGratisista (© Department of Natural\nResources Canada), CanVecista (© Department of Natural\nResources Canada), ja StatCanista (Geography Division,\nStatistics Canada).</li> \n<li><strong>Uusi-Seelanti</strong>: Sisältää tietoja Land Information New Zealandista. Crown Copyright.\n<li><strong>Puola</strong>: Sisältää tietoja\n<a href=\"http://ump.waw.pl/\">UMP-pcPL-kartoista. Tekijänoikeus\nUMP-pcPL:n tekijät.</li>\n<li><strong>Yhdistyneet kuningaskunnat</strong>: Sisältää Ordnance\nSurveyn keräämiä tietoja © Crown Copyright ja tietokantojen käyttöoikeus\n2010.\n</ul>\n\n\n<p>\nTietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta.\n</p>"
+    native: 
+      mapping_link: aloittaa kartoituksen
+      native_link: suomenkieliseen versioon
+      text: Tarkastelet on tekijänoikeussivun englanninkielistä versiota. Voit siirtyä takaisin {{native_link}} tai voit lopettaa lukemisen tekijänoikeuksista  ja {{mapping_link}}.
+      title: Tietoja sivusta
   message: 
     delete: 
       deleted: Viesti poistettu
@@ -908,7 +933,7 @@ fi:
       shortlink: Lyhytosoite
     key: 
       map_key: Karttamerkit
-      map_key_tooltip: Kartat (mapnik) selitteet tälle tasolle
+      map_key_tooltip: Merkkien selitykset
       table: 
         entry: 
           admin: Hallinnollinen raja
@@ -1020,6 +1045,11 @@ fi:
       body: Valitettavasti käyttäjää {{user}} ei ole. Tarkista oikeinkirjoitus tai ehkä napsauttamasi linkki on väärä.
       heading: Käyttäjää {{user}} ei ole olemassa
       title: Käyttäjää ei löydy
+    offline: 
+      heading: GPX-jälkien tallennus ei ole käytettävissä
+      message: GPX-jälkien tallennusjärjestelmä ei ole tällä hetkellä käytettävissä
+    offline_warning: 
+      message: GPX-tiedostojen tallennus ei ole tällä hetkellä käytettävissä
     trace: 
       ago: "{{time_in_words_ago}} sitten"
       by: käyttäjältä
@@ -1036,6 +1066,7 @@ fi:
       private: YKSITYINEN
       public: JULKINEN
       trace_details: Näytä jäljen tiedot
+      trackable: SEURATTAVA
       view_map: Selaa karttaa
     trace_form: 
       description: Kuvaus
@@ -1050,11 +1081,14 @@ fi:
       see_all_traces: Näytä kaikki jäljet
       see_your_traces: Näytä kaikki omat jäljet
       traces_waiting: Lähettämiäsi jälkiä on jo {{count}} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan.
+      upload_trace: Lisää GPS-jälki
+      your_traces: Omat jäljet
     trace_optionals: 
       tags: Tägit
     trace_paging_nav: 
       next: Seuraava &raquo;
       previous: "&laquo; Edellinen"
+      showing_page: Sivu {{page}}
     view: 
       delete_track: Poista tämä jälki
       description: "Kuvaus:"
@@ -1076,6 +1110,8 @@ fi:
       visibility: "Näkyvyys:"
     visibility: 
       identifiable: Tunnistettavissa (näytetään jälkiluettelossa ja pisteet tunnistettavasti järjestettynä aikaleimoineen)
+      private: Yksityinen (pisteet vain ilman nimeä ja aikaleimoja)
+      public: Julkisen (näytetään jälkiluettelossa, mutta pisteet ilman nimeä ja aikaleimoja)
       trackable: Jäljitettävissä (pisteet jaetaan järjestettynä aikaleimoineen, mutta nimettömänä)
   user: 
     account: 
@@ -1266,6 +1302,7 @@ fi:
       time_past: Päättyi {{time}} sitten.
       until_login: Aktiivinen kunnes käyttäjä kirjautuu sisään.
     index: 
+      empty: Ei estoja.
       heading: Luettelo käyttäjän estoista
       title: Estetyt käyttäjät
     new: 
@@ -1281,10 +1318,12 @@ fi:
       confirm: Oletko varma?
       display_name: Estetty käyttäjä
       edit: Muokkaa
+      not_revoked: (ei kumottu)
       reason: Eston syy
       revoke: Estä!
       revoker_name: Eston tehnyt
       show: Näytä
+      status: Tila
     period: 
       one: 1 tunti
       other: "{{count}} tuntia"
index c0f871cb27462209b5e81f0b2097a11c41146903..1d6e390b6d4888746f3f10f9e61a46f504e6636f 100644 (file)
@@ -12,6 +12,8 @@
 # Author: Peter17
 # Author: Quentinv57
 # Author: Urhixidur
+# Author: Verdy p
+# Author: Yvecai
 fr: 
   activerecord: 
     attributes: 
@@ -313,7 +315,7 @@ fr:
       longitude: "Longitude:"
       marker_text: Emplacement de l'entrée du journal
       save_button: Sauvegarder
-      subject: "Sujet:"
+      subject: "Objet :"
       title: Modifier l'entrée du journal
       use_map_link: Utiliser la carte
     feed: 
@@ -357,6 +359,17 @@ fr:
       save_button: Enregistrer
       title: Journal de {{user}} | {{title}}
       user_title: Journal de {{user}}
+  editor: 
+    default: Par défaut (actuellement {{name}})
+    josm: 
+      description: JOSM (par extension contrôlée à distance)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (éditeur intégré au navigateur)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (éditeur intégré au navigateur)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Ajouter un marqueur à la carte
@@ -679,7 +692,7 @@ fr:
           coastline: Littoral
           crater: Cratère
           feature: Élément
-          fell: Fell
+          fell: Lande
           fjord: Fjord
           geyser: Geyser
           glacier: Glacier
@@ -699,7 +712,7 @@ fr:
           scree: Éboulis
           scrub: Broussailles
           shoal: Haut-fond
-          spring: Cascade
+          spring: Source
           strait: Détroit
           tree: Arbre
           valley: Vallée
@@ -884,6 +897,7 @@ fr:
     donate: Soutenez OpenStreetMap, {{link}} au fond pour améliorer le matériel.
     donate_link_text: participez
     edit: Modifier
+    edit_with: Modifier avec {{editor}}
     export: Exporter
     export_tooltip: Exporter les données de la carte
     gps_traces: Traces GPS
@@ -1116,7 +1130,7 @@ fr:
       allow_read_gpx: lire ses traces GPS privées.
       allow_read_prefs: lire ses préférences utilisateur.
       allow_write_api: modifier la carte.
-      allow_write_diary: créez des entrées dans les journaux, des commentaires et faîtes-vous des amis.
+      allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis.
       allow_write_gpx: envoyer des traces GPS.
       allow_write_prefs: modifier ses préférences utilisateur.
       callback_url: URL de rappel
@@ -1146,7 +1160,7 @@ fr:
       allow_read_gpx: lire leurs traces GPS privées.
       allow_read_prefs: consulter ses préférences utilisateur.
       allow_write_api: modifier la carte.
-      allow_write_diary: créez des entrées dans le journal, des commentaire et faîtes-vous des amis.
+      allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis.
       allow_write_gpx: envoi trace GPS.
       allow_write_prefs: modifier ses préférences utilisateur.
       authorize_url: "URL d'autorisation :"
@@ -1163,11 +1177,13 @@ fr:
     edit: 
       anon_edits_link_text: Trouvez pourquoi ici.
       flash_player_required: Vous avez besoin d’un lecteur Flash pour utiliser Potlatch, l’éditeur Flash de OpenStreetMap. Vous pouvez <a href='http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash'>télécharger Flash Player sur le site d’Adobe</a>. <a href='http://wiki.openstreetmap.org/wiki/Editing'>D’autres options</a> sont également disponibles pour modifier OpenStreetMap.
+      no_iframe_support: Votre navigateur ne supporte pas les iframes HTML, qui sont nécessaires pour cette fonctionnalité.
       not_public: Vous n'avez pas réglé vos modifications pour qu'elles soient publiques.
       not_public_description: Vous ne pouvez plus modifier la carte à moins que vous ne rendiez vos modifications publiques. Vous pouvez rendre vos modifications publiques à partir de votre {{user_page}}.
       potlatch_unsaved_changes: Vous avez des modifications non sauvegardées. (Pour sauvegarder dans Potlatch, vous devez dé-sélectionner le way ou le node en cours si vous modifiez en mode direct, ou cliquer sur sauvegarder si vous avez un bouton sauvegarder.)
       user_page_link: page utilisateur
     index: 
+      josm_failed: La modification a échoué - veuillez vous assurer que JOSM est chargé et que l’extension de contrôle à distance est activée
       js_1: Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez désactivé Javascript.
       js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes.
       js_3: Si vous êtes dans l'incapacité d'utiliser Javascript, essayer d'utiliser le <a href='http://tah.openstreetmap.org/Browse/'>navigateur statique de Tiles@Home</a>.
@@ -1179,7 +1195,7 @@ fr:
       shortlink: Lien court
     key: 
       map_key: Légende de la carte
-      map_key_tooltip: Clé pour la carte
+      map_key_tooltip: Légende de la carte
       table: 
         entry: 
           admin: Limite administrative
@@ -1350,7 +1366,7 @@ fr:
       start_coordinates: "Coordonnées de départ :"
       tags: "Balises :"
       title: Affichage de la trace {{name}}
-      trace_not_found: Trace introuvable !
+      trace_not_found: Trace non trouvée !
       uploaded: "Envoyé le :"
       visibility: "Visibilité :"
     visibility: 
@@ -1364,7 +1380,7 @@ fr:
         agreed: Vous avez accepté les nouveaux termes du contributeur.
         agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications comme relevant du domaine public.
         heading: "Termes du contributeur :"
-        link text: Qu'est-ce que c'est ?
+        link text: qu’est-ce que ceci ?
         not yet agreed: Vous n’avez pas encore accepté les nouveaux termes du contributeur.
         review link text: Veuillez suivre ce lien à votre convenance pour examiner et accepter les nouveaux termes du contributeur.
       current email address: "Adresse de courriel actuelle :"
@@ -1383,6 +1399,7 @@ fr:
       new email address: "Nouvelle adresse de courriel :"
       new image: Ajouter une image
       no home location: Vous n'avez pas indiqué l'emplacement de votre domicile.
+      preferred editor: "Éditeur préféré :"
       preferred languages: "Langues préférées :"
       profile description: "Description du profil :"
       public editing: 
@@ -1390,7 +1407,7 @@ fr:
         disabled link text: pourquoi ne puis-je pas modifier ?
         enabled: Activé. Non anonyme et peut modifier les données.
         enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: Qu'est-ce que c'est ?
+        enabled link text: qu’est-ce que ceci ?
         heading: "Modification publique :"
       public editing note: 
         heading: Modification publique
@@ -1466,7 +1483,7 @@ fr:
       success: "{{name}} est à présent votre ami."
     new: 
       confirm email address: "Confirmer l'adresse e-mail :"
-      confirm password: "Confirmer le mot de passe :"
+      confirm password: "Confirmez le mot de passe :"
       contact_webmaster: Veuillez contacter le <a href='mailto:webmaster@openstreetmap.org'>webmaster</a> pour qu'il vous crée un compte - nous essaierons de traiter votre demande le plus rapidement possible.
       continue: Continuer
       display name: "Nom affiché :"
@@ -1493,7 +1510,7 @@ fr:
       not_a_friend: "{{name}} n'est pas parmi vos amis."
       success: "{{name}} a été retiré de vos amis."
     reset_password: 
-      confirm password: "Confirmer le mot de passe :"
+      confirm password: "Confirmez le mot de passe :"
       flash changed: Votre mot de passe a été modifié.
       flash token bad: Vous n'avez pas trouvé ce jeton, avez-vous vérifié l'URL ?
       heading: Réinitialiser le mot de passe de {{user}}
@@ -1510,7 +1527,7 @@ fr:
     terms: 
       agree: J'accepte
       consider_pd: En plus de l’accord ci-dessus, je considère mes contributions comme étant dans le domaine public
-      consider_pd_why: Qu'est-ce que ceci ?
+      consider_pd_why: qu’est-ce que ceci ?
       decline: Décliner
       heading: Termes du contributeur
       legale_names: 
@@ -1624,7 +1641,7 @@ fr:
       confirm: Êtes-vous sûr ?
       creator_name: Créateur
       display_name: Utilisateur Bloqué
-      edit: Éditer
+      edit: Modifier
       not_revoked: (non révoqué)
       reason: Motif du blocage
       revoke: Révoquer !
index c1dc2440a041fe7ec1a4745fcb2b2c4131b218cc..bf80732e0eb57e4ce52a533ebac95419a104a3f2 100644 (file)
@@ -337,6 +337,7 @@ fur:
           atm: Bancomat
           auditorium: Auditori
           bank: Bancje
+          bench: Bancjute
           bureau_de_change: Ufizi di cambi
           bus_station: Stazion des corieris
           car_wash: Lavaç machinis
@@ -353,14 +354,18 @@ fur:
           fountain: Fontane
           fuel: Stazion di riforniment
           hospital: Ospedâl
+          kindergarten: Scuelute
           library: Biblioteche
           market: Marcjât
           office: Ufizi
           park: Parc
           pharmacy: Farmacie
           place_of_worship: Lûc di cult
+          police: Polizie
           post_office: Pueste
+          prison: Preson
           public_building: Edifici public
+          public_market: Marcjât public
           restaurant: Ristorant
           sauna: Saune
           school: Scuele
@@ -369,6 +374,7 @@ fur:
           theatre: Teatri
           townhall: Municipi
           university: Universitât
+          veterinary: Veterinari
           wifi: Acès a internet WiFi
           youth_centre: Centri zovanîl
         boundary: 
@@ -408,6 +414,7 @@ fur:
           residential: Aree residenziâl
           vineyard: Vigne
         leisure: 
+          fishing: Riserve par pescjâ
           garden: Zardin
           golf_course: Troi di golf
           miniature_golf: Minigolf
@@ -416,6 +423,7 @@ fur:
           sports_centre: Centri sportîf
           stadium: Stadi
           swimming_pool: Pissine
+          track: Piste pe corse
         natural: 
           bay: Rade
           channel: Canâl
@@ -460,9 +468,12 @@ fur:
           hairdresser: Piruchîr o barbîr
           insurance: Assicurazion
           laundry: Lavandarie
+          market: Marcjât
+          optician: Otic
           supermarket: Supermarcjât
           toys: Negozi di zugatui
         tourism: 
+          hostel: Ostel
           information: Informazions
           museum: Museu
           valley: Val
@@ -478,7 +489,11 @@ fur:
         cycle_map: Cycle Map
         noname: CenceNon
     site: 
+      edit_disabled_tooltip: Cres il zoom par cambiâ la mape
+      edit_tooltip: Cambie la mape
       edit_zoom_alert: Tu scugnis cressi il zoom par cambiâ la mape
+      history_disabled_tooltip: Cres il zoom par viodi i cambiaments in cheste aree
+      history_tooltip: Cjale i cambiaments in cheste aree
       history_zoom_alert: Tu scugnis cressi il zoom par viodi il storic dai cambiaments
   layouts: 
     copyright: Copyright &amp; Licence
@@ -591,11 +606,16 @@ fur:
       delete_button: Elimine
   notifier: 
     diary_comment_notification: 
+      footer: Tu puedis ancje lei il coment su {{readurl}} e tu puedis zontâ un coment su {{commenturl}} o ben rispuindi su {{replyurl}}
+      header: "{{from_user}} al à zontât un coment ae tô vos dal diari di OpenStreetMap cun sogjet {{subject}}:"
       hi: Mandi {{to_user}},
       subject: "[OpenStreetMap] {{user}} al à zontât un coment ae tô vôs dal diari"
     email_confirm: 
       subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche"
+    email_confirm_plain: 
+      click_the_link: Se tu sês propite tu, par plasê frache sul leam ca sot par confermâ il cambiament.
     friend_notification: 
+      befriend_them: Tu puedis ancje zontâlu/le come amì in {{befriendurl}}.
       had_added_you: "{{user}} ti à zontât come amì su OpenStreetMap."
       see_their_profile: Tu puedis viodi il lôr profîl su {{userurl}}.
       subject: "[OpenStreetMap] {{user}} ti à zontât come amì su OpenStreetMap."
@@ -609,10 +629,14 @@ fur:
       with_description: cu la descrizion
       your_gpx_file: Al somee che il to file GPX
     message_notification: 
+      footer1: Tu puedis ancje lei il messaç su {{readurl}}
+      footer2: e tu puedis rispuindi su {{replyurl}}
+      header: "{{from_user}} ti à mandât un messaç su OpenStreetMap cun sogjet {{subject}}:"
       hi: Mandi {{to_user}},
     signup_confirm: 
       subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche"
     signup_confirm_html: 
+      hopefully_you: Cualchidun (sperìn propite tu) al vûl creâ une identitât
       introductory_video: Tu puedis viodi un {{introductory_video_link}}.
   oauth_clients: 
     form: 
@@ -634,7 +658,7 @@ fur:
       shortlink: Leam curt
     key: 
       map_key: Leiende
-      map_key_tooltip: Leiende pal rendering mapnik a chest nivel di zoom
+      map_key_tooltip: Leiende de mape
       table: 
         entry: 
           admin: Confin aministratîf
@@ -661,6 +685,7 @@ fur:
             - Scuele
             - universitât
           station: stazion de ferade
+          tourist: Atrazion turistiche
           tram: 
             - tram
             - tram
@@ -755,6 +780,8 @@ fur:
       visibility: "Visibilitât:"
   user: 
     account: 
+      contributor terms: 
+        link text: ce isal chest?
       current email address: "Direzion di pueste eletroniche atuâl:"
       email never displayed publicly: (mai mostrade in public)
       flash update success: Informazions dal utent inzornadis cun sucès.
@@ -788,6 +815,8 @@ fur:
       button: Conferme
       press confirm button: Frache sul boton di conferme par confermâ la gnove direzion di pueste.
       success: Tu âs confermât la tô direzion di pueste, graziis par jessiti regjistrât
+    confirm_resend: 
+      failure: L'utent {{name}} nol è stât cjatât.
     list: 
       heading: Utents
       showing: 
@@ -810,6 +839,8 @@ fur:
       title: Jes
     lost_password: 
       email address: "Direzion di pueste:"
+      heading: Âstu pierdût la password?
+      title: Password pierdude
     make_friend: 
       already_a_friend: Tu sês za amì di {{name}}.
       success: "{{name}} al è cumò to amì."
@@ -817,9 +848,10 @@ fur:
       confirm email address: "Conferme direzion pueste:"
       continue: Va indevant
       display name: "Non di mostrâ:"
+      display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs gambiâlu plui tart tes preferencis.
       email address: "Direzion di pueste eletroniche:"
       fill_form: Jemple il modul e ti mandarin in curt un messaç di pueste par ativâ il to profîl.
-      flash create success message: L'utent al è stât creât cun sucès. Spiete che ti rivedi par pueste il messaç di conferme e po tu podarâs scomençâ a mapâ intun lamp :-)<br /><br />Ten a ments che no tu rivarâs a jentrâ fin cuant che no tu varâs ricevût il messaç e confermât la direzion di pueste eletroniche.<br /><br />Se tu dopris un sisteme antispam che al mande richiestis di conferme, siguriti di meti te whitelist webmaster@openstreetmap.org, parcè che no podin rispuindi aes richiestis di conferme.
+      flash create success message: Graciis par jessiti regjistrât. Spiete che ti rivedi par pueste il messaç di conferme che o vin mandât a {{email}} e po tu podarâs scomençâ a mapâ intun lamp :-)<br /><br />Se tu dopris un sisteme antispam che al mande richiestis di conferme, siguriti di meti te whitelist webmaster@openstreetmap.org, parcè che no podin rispuindi aes richiestis di conferme.
       heading: Cree un account utent
       license_agreement: Creant un profîl tu scugnis aprovâ i <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">tiermins par contribuî</a>.
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!
@@ -875,6 +907,7 @@ fur:
       new diary entry: gnove vôs dal diari
       no friends: No tu âs ancjemò nissun amì.
       no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di te.
+      oauth settings: configurazion OAuth
       remove as friend: gjave dai amîs
       send message: mande messaç
       settings_link_text: impostazions
@@ -893,6 +926,7 @@ fur:
       status: Stât
     show: 
       confirm: Sêstu sigûr?
+      edit: Cambie
       show: Mostre
       status: Stât
   user_role: 
index f24a01ca844f127ef917e13a5a71b37a03a0007b..dde5a0270fd19771d2b16709f6dc4834bd369c9b 100644 (file)
@@ -1394,9 +1394,11 @@ gl:
       update home location on click: Quere actualizar o domicilio ao premer sobre o mapa?
     confirm: 
       already active: Esta conta xa se confirmou.
+      before you start: Sabemos que probablemente queira comezar cos mapas de contado, pero antes gustaríanos que enchese algunha información acerca de vostede no formulario que hai a continuación.
       button: Confirmar
       heading: Confirmar unha conta de usuario
       press confirm button: Prema sobre o botón de confirmación que aparece a continuación para activar a súa conta.
+      reconfirm: Se hai tempo que non accede ao sistema, quizais necesite <a href="{{reconfirm}}">enviarse un novo correo electrónico de confirmación</a>.
       success: Confirmouse a súa conta. Grazas por se rexistrar!
       unknown token: Semella que o pase non existe.
     confirm_email: 
index 95c9c00aafbfc458322274eebc1a7f502aaf9a61..adf11b748a5a4cc5094a45bd0b21f8882cbb47d6 100644 (file)
@@ -359,6 +359,17 @@ hsb:
       save_button: Składować
       title: Dźenik {{user}} | {{title}}
       user_title: dźenik wužiwarja {{user}}
+  editor: 
+    default: Standard (tuchwilu {{name}}
+    josm: 
+      description: JOSM (přez tykač za dalokowodźenje)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (editor za wobdźěłowanje we wobhladowaku)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor za wobdźěłowanje we wobhladowaku)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Marku karće přidać
@@ -886,6 +897,7 @@ hsb:
     donate: Podpěraj OpenStreetMap přez {{link}} k fondsej aktualizacije hardwary.
     donate_link_text: Darjenje
     edit: Wobdźěłać
+    edit_with: Z {{editor}} wobdźěłać
     export: Eksport
     export_tooltip: Kartowe daty eksportować
     gps_traces: GPS-ćěrje
@@ -1068,6 +1080,7 @@ hsb:
     signup_confirm: 
       subject: "[OpenStreetMap] Twoju e-mejlowu adresu wobkrućić"
     signup_confirm_html: 
+      ask_questions: Móžeš so za něčim wo OpenStreetMap  na našim sydle <a href="http://help.openstreetmap.org/">Prašenja a wotmołwy</a> prašeć.
       click_the_link: Jeli ty to sy, witaj! Klikń prošu na slědowacy wotkaz, zo by konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap
       current_user: Lisćina tuchwilnych wužiwarjow po jich stejnišću w swěće steji na <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Lisćina wužiwarjow po geografiskim regionje</a> k dispoziciji.
       get_reading: Čitaj wo OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">na wikiju</a>, wobstaraj sej najnowše powěsće přez <a href="http://blog.openstreetmap.org/">blog OpenStreetMap</a> abo <a href="http://twitter.com/openstreetmap">Twitter</a>, abo přečitaj <a href="http://www.opengeodata.org/">blog OpenGeoData</a> załožerja OpenStreetMap Steve Coast za historiju projekta, kotryž ma tež <a href="http://www.opengeodata.org/?cat=13">podcasty</a>!
@@ -1080,6 +1093,7 @@ hsb:
       video_to_openstreetmap: zawodne widejo wo OpenStreetMap
       wiki_signup: Móžeš so tež <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">w  wikiju OpenStreetMap registrować</a>.
     signup_confirm_plain: 
+      ask_questions: "Móžeš so za něčim wo OpenStreetMap  na našim sydle Prašenja a wotmołwy prašeć:"
       blog_and_twitter: "Wobstaraj sej najnowše powěsće přez blog OpenStreetMap abo Twitter:"
       click_the_link_1: Jeli sy to ty, witaj! Prošu klikń na slědowacy wotkaz, zo by swoje
       click_the_link_2: konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap.
@@ -1165,11 +1179,13 @@ hsb:
     edit: 
       anon_edits_link_text: Zwěsćić, čehoždla je tomu tak.
       flash_player_required: Trjebaš wothrawak Flash, zo by Potlatch, editor OpenStreetMap Flash wužiwał. Móžeš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wothrawak Flash wot Adobe.com sćahnyć</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotre druhe móžnosće</a> tež za wobdźěłowanje OpenStreetMap k dispoziciji steja.
+      no_iframe_support: Twó wobhladowak njepodpěruje iframe-elementy, kotrež su za tutu funkciju trěbne.
       not_public: Njejsy swoje změny jako zjawne markěrowane.
       not_public_description: Njemožeš hižo kartu wobźěłać, chibazo činiš to. Móžeš swoje změny na swojej {{user_page}} jako zjawne markěrować.
       potlatch_unsaved_changes: Nimaš njeskładowane změny. (Zo by w programje Potlatch składował, wotstroń woznamjenjenje aktualneho puća abo dypka, jeli w dynamiskim modusu wobdźěłuješ, abo klikń na Składować, jeli składowanske tłóčatko eksistuje.
       user_page_link: wužiwarskej stronje
     index: 
+      josm_failed: Wobdźěłowanje je so njeporadźiło - přeswědč so, zo JOSM je začitany a tykač za dalokowodźenje je zmóžnjeny
       js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript znjemóžnił.
       js_2: OpenStreetMap JavaScript za slippy map wužiwa.
       js_3: Móžeš <a href="http://tah.openstreetmap.org/Browse/">wobhladowak Tiles@Home</a> wužiwać, jeli njemóžeš JavaScript znóžnić.
@@ -1181,7 +1197,7 @@ hsb:
       shortlink: Krótki wotkaz
     key: 
       map_key: Legenda
-      map_key_tooltip: Legenda za kartu Mapnik na tutym skalowanskim schodźenku
+      map_key_tooltip: Legenda za kartu
       table: 
         entry: 
           admin: Zarjadniska hranica
@@ -1385,6 +1401,7 @@ hsb:
       new email address: "Nowa e-mejlowa adresa:"
       new image: Wobraz přidać
       no home location: Njejsy swoje domjace stejnišćo zapodał.
+      preferred editor: "Preferowany editor:"
       preferred languages: "Preferowane rěče:"
       profile description: "Profilowe wopisanje:"
       public editing: 
@@ -1403,16 +1420,23 @@ hsb:
       title: Konto wobdźěłać
       update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować?
     confirm: 
+      already active: Tute konto bu hižo wobkrućene.
+      before you start: Wěmy, zo najskerje njemóžeš dočakać kartěrowanje započeć, ale ty měł najprjedy někotre informacije wo sebje w slědowacym formularje podać.
       button: Wobkrućić
       heading: Wužiwarske konto wobkrućić
       press confirm button: Klikni deleka na wobkrućenske tłóčatko, zo by swoje konto aktiwizował.
+      reconfirm: Jeli je hižo něšto časa zašło, wot toho zo sy zregistrował, dyrbiš ewentuelnje sam <a href="{{reconfirm}}">nowu wobkrućensku e-mejl pósłać</a>.
       success: Twoje konto bu wobkrućene, dźakujemy so za registrowanje!
+      unknown token: Zda so, zo token njeeksistuje.
     confirm_email: 
       button: Wobkrućić
       failure: E-mejlowa adresa je hižo z tutym kodom wobkrućena.
       heading: Změnjenje e-mejloweje adresy wobkrućić
       press confirm button: Klikń deleka na wobkrućenske tłóčatko, zo by swoju nowu e-mejlowu adresu wobkrućił.
       success: Twoja e-mejlowa adresa bu wobkrućena, dźakujemy so za registrowanje!
+    confirm_resend: 
+      failure: Wužiwar {{name}} njenamakany.
+      success: Smy nowu wobkrućenski e-mejl na {{email}} póslali a tak ruče hač swoje konto wobkrućiš, móžeš kartěrowanje započeć.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
     filter: 
       not_an_administrator: Dyrbiš administrator być, zo by tutu akciju wuwjedł.
     go_public: 
@@ -1429,7 +1453,7 @@ hsb:
       summary_no_ip: "{{name}} dnja {{date}} wutworjeny"
       title: Wužiwarjo
     login: 
-      account not active: Bohužel je twoje konto hišće aktiwne njeje.<br />Prošu klikń na wotkaz w e-mejlu kontoweho wubkrućenja, zo by swoje konto aktiwizował.
+      account not active: Bohužel je twoje konto hišće aktiwne njeje.<br />Prošu klikń na wotkaz w e-mejlu kontoweho wubkrućenja, zo by swoje konto aktiwizował, abo <a href="{{reconfirm}}">proš wo nowu wobkrućensku e-mejl</a>.
       account suspended: Twoje konto bu bohužel podhladneje aktiwity dla wupowědźene.<br />Stajće so prošu z {{webmaster}} do zwiska, jeli chceš wo tym diskutować.
       auth failure: Bohužel přizjewjenje z tutymi podaćemi móžno njeje.
       create_account: załož konto
@@ -1468,7 +1492,7 @@ hsb:
       display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo w nastajenjach změnić.
       email address: "E-mejlowa adresa:"
       fill_form: Wupjelń formular a budźemy ći hnydom e-mejl słać, zo by swoje konto aktiwizował.
-      flash create success message: Wužiwarske konto bu wuspěšnje załožene. W e-mejlu, kotruž dóstanješ, namakaš wobkrućenski wotkaz, a móžeš so hnydom do kartěrowanja dać :-)<br /><br />Prošu dźiwaj na to, zo njemóžeš so přizjewić, doniž njejsy swoju e-mejlowu addresu wobkrućił.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, da přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
+      flash create success message: Dźakujemy so za registrowanje. Smy wobkrućenski e-mejl na {{email}} póslali a tak ruče hač swoje konto wobkrućiš, móžeš kartěrowanje započeć.<br /><br /> Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić.
       heading: Wužiwarske konto załožić
       license_agreement: Hdyž swoje konto wubkrućeš, dyrbiš <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">wuměnjenjam za sobuskutkowarjow</a> přihłosować.
       no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce załožić.
index ec6dea705c802aa1beb2ddf7bd3d524effab7693..528f6b44f9c0b2fefb3f2bb10f922a2468f3fafb 100644 (file)
@@ -1183,7 +1183,7 @@ hu:
       shortlink: Shortlink
     key: 
       map_key: Jelmagyarázat
-      map_key_tooltip: Jelmagyarázat a Mapnik rendereléshez ezen a nagyítási szinten
+      map_key_tooltip: Jelmagyarázat a térképhez
       table: 
         entry: 
           admin: Közigazgatási határ
@@ -1370,7 +1370,7 @@ hu:
         heading: "Hozzájárulási feltételek:"
         link text: mi ez?
         not yet agreed: Még nem fogadtad el az új hozzájárulási feltételeket.
-        review link text: Kérk, kövesd ezt a hivatkozást az új hozzájárulási feltételek áttekintéséhez és elfogadásához.
+        review link text: Kérlek, kövesd ezt a hivatkozást az új hozzájárulási feltételek áttekintéséhez és elfogadásához.
       current email address: "Jelenlegi e-mail cím:"
       delete image: Jelenlegi kép eltávolítása
       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
@@ -1405,16 +1405,23 @@ hu:
       title: Felhasználói fiók szerkesztése
       update home location on click: Otthon helyének frissítése, amikor a térképre kattintok?
     confirm: 
+      already active: Ez a fiók már megerősítésre került.
+      before you start: Tudjuk, hogy valószínűleg sietve kezdenél térképezni, de mielőtt ezt megtennéd, - ha úgy gondolod - megadhatsz magadról néhány további információt az alábbi űrlapon.
       button: Megerősítés
       heading: Felhasználói fiók megerősítése
       press confirm button: Felhasználói fiókod megerősítéséhez nyomd meg az alábbi megerősítés gombot.
+      reconfirm: Ha már eltelt némi idő azóta, amióta regisztráltál, akkor szükséged lehet arra, hogy <a href="{{reconfirm}}">küldj magadnak egy új megerősítő emailt</a>.
       success: Felhasználói fiókod megerősítve, köszönjük a regisztrációt!
+      unknown token: Ez az utalvány úgy tűnik, nem létezik.
     confirm_email: 
       button: Megerősítés
       failure: Egy e-mail cím már megerősítésre került ezzel az utalvánnyal.
       heading: E-mail cím módosításának megerősítése
       press confirm button: Új e-mail címed megerősítéséhez nyomd meg az alábbi megerősítés gombot.
       success: E-mail címed megerősítve, köszönjük a regisztrációt!
+    confirm_resend: 
+      failure: "{{name}} felhasználó nem található."
+      success: Elküldtünk egy új megerősítő üzenetet a(z) {{email}} címre, és amint megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.<br /><br />Ha használsz olyan antispam rendszert, amely megerősítési kérelmeket küld, akkor győződj meg róla, hogy engedélylistára tetted a webmaster@openstreetmap.org címet, mivel nem tudunk válaszolni megerősítési kérelmekre.
     filter: 
       not_an_administrator: Ennek a műveletnek az elvégzéséhez adminisztrátori jogosultsággal kell rendelkezned.
     go_public: 
@@ -1431,7 +1438,7 @@ hu:
       summary_no_ip: "{{name}} letrejött ekkor: {{date}}"
       title: Felhasználók
     login: 
-      account not active: Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Az aktiváláshoz, kattints a fiókodat megerősítő e-mailben lévő hivatkozásra.
+      account not active: Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Fiókod aktiválásához kérlek, használd a fiókodat megerősítő emailben található hivatkozást, vagy <a href="{{reconfirm}}">kérj egy új megerősítő emailt</a>.
       account suspended: Sajnálom, felhasználói fiókod felfüggesztésre került gyanús tevékenységed miatt.<br />Kérlek, lépj kapcsolatba a {{webmaster}}rel, ha meg szeretnéd vitatni ezt.
       auth failure: Sajnálom, ilyen adatokkal nem tudsz bejelentkezni.
       create_account: hozz létre egy új felhasználói fiókot
@@ -1470,7 +1477,7 @@ hu:
       display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban később megváltoztathatod.
       email address: "E-mail cím:"
       fill_form: Töltsd ki az űrlapot, és küldünk neked egy gyors e-mailt felhasználói fiókod aktiválásához.
-      flash create success message: A felhasználó sikeresen létrehozva. Nézd meg az e-mailjeidet a megerősítő levélhez, és pillanatokon belül szerkesztheted a térképet :-)<br /><br />Felhívom a figyelmed, hogy addig nem tudsz bejelentkezni, amíg nem kaptad meg és nem erősítetted meg az e-mail címedet.<br /><br />Ha olyan antispam rendszert használsz, ami megerősítő kérést küld, akkor bizonyosodj meg róla, hogy engedélyezőlistára tetted a webmaster@openstreetmap.org címet, mivel mi nem tudunk válaszolni megerősítő kérésekre.
+      flash create success message: Köszönjük, hogy regisztráltál. Küldtünk egy megerősítő üzenetet a(z) {{email}} címre, és amint megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.<br /><br />Ha használsz olyan antispam rendszert, amely megerősítési kérelmeket küld, akkor győződj meg róla, hogy engedélylistára tetted a webmaster@openstreetmap.org címet, mivel nem tudunk válaszolni megerősítési kérelmekre.
       heading: Felhasználói fiók létrehozása
       license_agreement: Amikor megerősíted a felhasználói fiókodat, el kell fogadnod a <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">hozzájárulási feltételeket</a>.
       no_auto_account_create: Sajnos jelenleg nem tudunk neked létrehozni automatikusan egy felhasználói fiókot.
@@ -1515,7 +1522,7 @@ hu:
         italy: Olaszország
         rest_of_world: A világ többi része
       legale_select: "Kérlek, válaszd ki a lakóhelyed szerinti országot:"
-      read and accept: Kérk, olvasd el az alábbi megállapodást, és nyomd meg az "egyetértek" gombot, hogy megerősítsd, elfogadod ezen megállapodás feltételeit a jelenlegi és jövőbeni hozzájárulásaidhoz.
+      read and accept: Kérlek, olvasd el az alábbi megállapodást, és nyomd meg az "egyetértek" gombot, hogy megerősítsd, elfogadod ezen megállapodás feltételeit a jelenlegi és jövőbeni hozzájárulásaidhoz.
       title: Hozzájárulási feltételek
     view: 
       activate_user: felhasználó aktiválása
index ebad73cb469721ac021588305d2d23a876b5e06e..1632fa4c923e746d0b036b27be62ac1a60021dcc 100644 (file)
@@ -1,6 +1,7 @@
 # Messages for Italian (Italiano)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Alessioz
 # Author: Bellazambo
 # Author: Beta16
 # Author: Davalv
@@ -329,6 +330,7 @@ it:
       user_title: Diario dell'utente {{user}}
     location: 
       edit: Modifica
+      location: "Località:"
       view: Visualizza
     new: 
       title: Nuova voce del diario
@@ -347,6 +349,17 @@ it:
       save_button: Salva
       title: Diario di {{user}} | {{title}}
       user_title: Diario dell'utente {{user}}
+  editor: 
+    default: Predefinito (al momento {{name}})
+    josm: 
+      description: JOSM (mediante l'estensione di controllo remoto)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (editor nel browser)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor nel browser)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Aggiungi un marcatore alla mappa
@@ -384,7 +397,9 @@ it:
   geocoder: 
     description: 
       title: 
+        geonames: Località da <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} da <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Località da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Città
         places: Luoghi
@@ -413,6 +428,7 @@ it:
         geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Risultati da <a href="http://openstreetmap.org/">Internal</a>
         osm_namefinder: Risultati da <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Risultati restituiti da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Risultati da <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
@@ -442,9 +458,11 @@ it:
           clinic: Clinica
           club: Club
           college: Scuola superiore
+          community_centre: Centro civico
           courthouse: Tribunale
           crematorium: Crematorio
           dentist: Dentista
+          doctors: Medici
           dormitory: Dormitorio
           drinking_water: Acqua potabile
           driving_school: Scuola guida
@@ -472,6 +490,7 @@ it:
           nightclub: Locale notturno
           nursery: Asilo nido
           nursing_home: Asilo nido
+          office: Ufficio
           park: Parco
           parking: Parcheggio
           pharmacy: Farmacia
@@ -509,6 +528,7 @@ it:
           administrative: Confine amministrativo
         building: 
           apartments: Edificio residenziale
+          bunker: Bunker
           chapel: Cappella
           church: Chiesa
           city_hall: Municipio
@@ -555,23 +575,23 @@ it:
           path: Sentiero
           pedestrian: Percorso pedonale
           platform: Piattaforma
-          primary: Strada principale
+          primary: Strada di importanza nazionale
           primary_link: Strada principale
           raceway: Pista
           residential: Strada residenziale
           road: Strada generica
-          secondary: Strada secondaria
+          secondary: Strada di importanza regionale
           secondary_link: Strada secondaria
           service: Strada di servizio
           services: Stazione di servizio
           steps: Scala
           stile: Scaletta
-          tertiary: Strada terziaria
-          track: Tracciato
+          tertiary: Strada di importanza locale
+          track: Strada forestale o agricola
           trail: Percorso escursionistico
           trunk: Superstrada
           trunk_link: Superstrada
-          unclassified: Strada non classificata
+          unclassified: Strada minore
           unsurfaced: Strada non pavimentata
         historic: 
           archaeological_site: Sito archeologico
@@ -589,6 +609,8 @@ it:
           museum: Museo
           ruins: Rovine
           tower: Torre
+          wayside_cross: Croce
+          wayside_shrine: Edicola votiva
           wreck: Relitto
         landuse: 
           allotments: Orti casalinghi
@@ -684,7 +706,7 @@ it:
           country: Nazione
           county: Contea (in Italia NON usare)
           farm: Area agricola
-          hamlet: Borgo
+          hamlet: Gruppo di case
           house: Casa
           houses: Gruppo di case
           island: Isola
@@ -700,7 +722,7 @@ it:
           suburb: Quartiere
           town: Paese
           unincorporated_area: Area non inclusa
-          village: Frazione
+          village: Piccolo paese
         railway: 
           abandoned: Linea ferroviaria abbandonata
           construction: Ferrovia in costruzione
@@ -713,6 +735,8 @@ it:
           light_rail: Ferrovia leggera
           monorail: Monorotaia
           narrow_gauge: Ferrovia a scartamento ridotto
+          platform: Banchina ferroviaria
+          preserved: Ferrovia storica
           station: Stazione ferroviaria
           subway: Stazione della metropolitana
           subway_entrance: Ingresso alla metropolitana
@@ -720,31 +744,50 @@ it:
           tram_stop: Fermata del tram
           yard: Zona di manovra ferroviaria
         shop: 
+          alcohol: Alcolici
+          art: Negozio d'arte
           bakery: Panetteria
+          beauty: Prodotti cosmetici
+          beverages: Negozio bevande
+          bicycle: Negozio biciclette
           books: Libreria
           butcher: Macellaio
           car: Concessionaria
           car_dealer: Concessionaria auto
           car_parts: Autoricambi
           car_repair: Autofficina
+          carpet: Tappeti
+          charity: Negozio solidale
           chemist: Farmacia
           clothes: Negozio di abbigliamento
           computer: Negozio di computer
+          confectionery: Pasticceria
+          convenience: Minimarket
+          copyshop: Copisteria
+          cosmetics: Negozio cosmetici
+          department_store: Grande magazzino
           discount: Discount
           doityourself: Fai da-te
           drugstore: Emporio
           dry_cleaning: Lavasecco
+          electronics: Elettronica
           estate_agent: Agenzia immobiliare
           farm: Parafarmacia
+          fashion: Negozio moda
           fish: Pescheria
           florist: Fioraio
           food: Alimentari
           funeral_directors: Agenzia funebre
           furniture: Arredamenti
+          gallery: Galleria d'arte
+          garden_centre: Centro giardinaggio
+          general: Emporio
           gift: Articoli da regalo
           greengrocer: Fruttivendolo
           grocery: Fruttivendolo
           hairdresser: Parrucchiere
+          hardware: Ferramenta
+          hifi: Hi-Fi
           insurance: Assicurazioni
           jewelry: Gioielleria
           kiosk: Edicola
@@ -752,16 +795,22 @@ it:
           mall: Centro commerciale
           market: Mercato
           mobile_phone: Centro telefonia mobile
+          motorcycle: Concessionario di motociclette
           music: Articoli musicali
           newsagent: Giornalaio
           optician: Ottico
+          organic: Negozio di prodotti naturali ed ecologici
           pet: Negozio animali
           photo: Articoli fotografici
+          salon: Salone
           shoes: Negozio di calzature
+          shopping_centre: Centro commerciale
           sports: Articoli sportivi
           supermarket: Supermercato
           toys: Negozio di giocattoli
           travel_agency: Agenzia di viaggi
+          video: Videoteca
+          wine: Alcolici
         tourism: 
           alpine_hut: Rifugio alpino
           artwork: Opera d'arte
@@ -820,6 +869,7 @@ it:
     donate: Supporta OpenStreetMap {{link}} al fondo destinato all'aggiornamento dell'hardware.
     donate_link_text: donando
     edit: Modifica
+    edit_with: Modifica con {{editor}}
     export: Esporta
     export_tooltip: Esporta i dati della mappa
     gps_traces: Tracciati GPS
@@ -829,6 +879,7 @@ it:
     help_title: Sito di aiuto per il progetto
     history: Storico
     home: posizione iniziale
+    home_tooltip: Vai alla posizione iniziale
     inbox: in arrivo ({{count}})
     inbox_tooltip: 
       one: La tua posta in arrivo contiene 1 messaggio non letto
@@ -997,6 +1048,7 @@ it:
     signup_confirm: 
       subject: "[OpenStreetMap] Conferma il tuo indirizzo email"
     signup_confirm_html: 
+      ask_questions: E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro <a href="http://help.openstreetmap.org/">sito di domande e risposte</a>.
       click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
       current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, è disponibile su <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Leggi di OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">sul wiki</a>, non perdere le ultime notizie sul <a href="http://blog.openstreetmap.org/">blog di OpenStreetMap</a> o su <a href="http://twitter.com/openstreetmap">Twitter</a>, oppure sfoglia il blog <a href="http://www.opengeodata.org/">OpenGeoData</a> di Steve Coast, fondatore di OpenStreetMap, per una storia completa del progetto; ci sono anche dei <a href="http://www.opengeodata.org/?cat=13">podcast da ascoltare</a>!
@@ -1009,6 +1061,7 @@ it:
       video_to_openstreetmap: video introduttivo su OpenStreetMap
       wiki_signup: Ci si può anche <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">iscrivere al wiki di OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:"
       blog_and_twitter: "Ottieni le ultime notizie tramite il blog di OpenStreetMap oppure Twitter:"
       click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante
       click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap.
@@ -1050,6 +1103,7 @@ it:
       allow_write_diary: crea pagine di diario, commenti e fai amicizia.
       allow_write_gpx: carica tracciati GPS.
       allow_write_prefs: modifica le loro preferenze utente.
+      callback_url: URL di richiamata
       name: Nome
       requests: "Richiedi le seguenti autorizzazioni da parte dell'utente:"
       required: Richiesto
@@ -1072,6 +1126,7 @@ it:
     not_found: 
       sorry: Siamo dolenti, quel {{type}} non è stato trovato.
     show: 
+      access_url: "URL del token di accesso:"
       allow_read_gpx: leggi i loro tracciati GPS privati.
       allow_read_prefs: leggi le loro preferenze utente.
       allow_write_api: modifica la mappa.
@@ -1080,20 +1135,24 @@ it:
       allow_write_prefs: modifica le sue preferenze utente.
       authorize_url: "Autorizza URL:"
       edit: Modifica dettagli
+      key: "Chiave del consumatore:"
       requests: "Richieste le seguenti autorizzazioni da parte dell'utente:"
       support_notice: Supportiamo HMAC-SHA1 (consigliato), così come testo normale in modalità SSL.
       title: Dettagli OAuth per {{app_name}}
+      url: "URL del token di richiesta:"
     update: 
       flash: Aggiornate con successo le informazioni sul client
   site: 
     edit: 
       anon_edits_link_text: Leggi il perché.
       flash_player_required: E' necessario un visualizzatore Flash per utilizzare Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre possibilità</a> per apportare modifiche a OpenStreetMap.
+      no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari per questa funzionalità.
       not_public: Non si sono impostate come pubbliche le proprie modifiche.
       not_public_description: Non è possibile modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria {{user_page}}.
       potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch, si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando nella modalità 'list', o cliccare sul bottone salva se presente.)
       user_page_link: pagina utente
     index: 
+      josm_failed: Modifica fallita - assicurarsi che JOSM sia avviato e che l'estensione di controllo remoto sia attiva
       js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript.
       js_2: OpenStreetMap utilizza JavaScript per le sua mappa.
       js_3: Se non si riesce ad abilitare JavaScript si può provare il <a href="http://tah.openstreetmap.org/Browse/">browser statico Tiles@Home</a>.
@@ -1105,13 +1164,16 @@ it:
       shortlink: Collegamento breve
     key: 
       map_key: Legenda
+      map_key_tooltip: Legenda
       table: 
         entry: 
           admin: Confine amministrativo
+          allotments: Area comune orti casalinghi
           apron: 
             - Area di parcheggio aeroportuale
             - Terminal
           bridge: Quadrettatura nera = ponte
+          bridleway: Percorso per equitazione
           brownfield: Area soggetta ad interventi di ridestinazione d'uso
           building: Edificio significativo
           byway: Byway (UK)
@@ -1119,13 +1181,16 @@ it:
             - Funivia
             - Seggiovia
           cemetery: Cimitero
+          centre: Centro sportivo
           commercial: Zona di uffici
           common: 
-            1: prato
+            - Area comune
+            - prato
           construction: Strade in costruzione
           cycleway: Pista Ciclabile
+          destination: Servitù di passaggio
           farm: Azienda agricola
-          footway: Pista pedonale
+          footway: Percorso pedonale
           forest: Foresta
           golf: Campo da golf
           heathland: Brughiera
@@ -1137,7 +1202,8 @@ it:
           motorway: Autostrada
           park: Parco
           permissive: Accesso permissivo
-          primary: Strada principale
+          pitch: Campo sportivo
+          primary: Strada di importanza nazionale
           private: Accesso privato
           rail: Ferrovia
           reserve: Riserva naturale
@@ -1149,18 +1215,20 @@ it:
           school: 
             - Scuola
             - Università
-          secondary: Strada secondaria
+          secondary: Strada di importanza regionale
           station: Stazione ferroviaria
           subway: Metropolitana
           summit: 
-            1: picco
+            - Picco montuoso
+            - Picco montuoso
           tourist: Attrazione turistica
+          track: Strada forestale o agricola
           tram: 
             - Metropolitana di superficie
             - Tram
-          trunk: Strada principale
+          trunk: Superstrada
           tunnel: Linea tratteggiata = tunnel
-          unclassified: Strada non classificata
+          unclassified: Strada minore
           unsurfaced: Strada non pavimentata
           wood: Bosco
     search: 
@@ -1300,6 +1368,7 @@ it:
       new email address: "Nuovo indirizzo e-mail:"
       new image: Aggiungi un'immagine
       no home location: Non si è inserita la propria posizione.
+      preferred editor: "Editor preferito:"
       preferred languages: "Lingua preferita:"
       profile description: "Descrizione del profilo:"
       public editing: 
@@ -1318,16 +1387,23 @@ it:
       title: Modifica profilo
       update home location on click: Aggiorna la posizione quando clicco sulla mapppa?
     confirm: 
+      already active: Questo profilo è stato già confermato.
+      before you start: Sappiamo che probabilmente hai fretta di iniziare a mappare, ma prima dovresti inserire alcune informazioni su di te nel modulo sottostante.
       button: Conferma
       heading: Conferma un profilo utente
       press confirm button: Premere sul pulsante di conferma sottostante per attivare il proprio profilo utente.
+      reconfirm: Se è passato un po' di tempo dall'ultimo accesso potrebbe essere necessario <a href="{{reconfirm}}">inviare una nuova email di conferma</a>.
       success: Il profilo utente è stato confermato, grazie per l'iscrizione!
+      unknown token: Questo token non sembra esistere.
     confirm_email: 
       button: Conferma
       failure: E' stato già confermato un indirizzo email con questo codice.
       heading: Conferma una variazione di indirizzo email
       press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email.
       success: L'indirizzo email è stato confermato, grazie per l'iscrizione!
+    confirm_resend: 
+      failure: Utente {{name}} non trovato.
+      success: E' stato spedito un nuovo messaggio di conferma all'indirizzo {{email}} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.<br /><br />Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
     filter: 
       not_an_administrator: Bisogna essere amministratori per poter eseguire questa azione.
     go_public: 
@@ -1344,7 +1420,7 @@ it:
       summary_no_ip: "{{name}} creato il {{date}}"
       title: Utenti
     login: 
-      account not active: Spiacenti, il tuo profilo non è ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo.
+      account not active: Spiacenti, il tuo profilo non è ancora attivo.<br />Si prega di utilizzare il collegamento presente nell'email di conferma per attivare il proprio profilo, oppure <a href="{{reconfirm}}">richiedere l'invio di una nuova email di conferma</a>.
       account suspended: Siamo spiacenti, il tuo account è stato sospeso a causa di attività sospette.<br />Contatta il {{webmaster}} se desideri discuterne.
       auth failure: Spiacenti, non si può accedere con questi dettagli.
       create_account: crealo ora
@@ -1383,7 +1459,7 @@ it:
       display name description: Il proprio nome utente visualizzato pubblicamente. Può essere modificato più tardi nelle preferenze.
       email address: "Indirizzo email:"
       fill_form: Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo.
-      flash create success message: L'utente è stato creato con successo. Controllare la propria email per conferma, e si sarà in grado di mappare immediatamente :-)<br /><br />Si ricorda che non si sarà in grado di effettuare l'accesso finché non si sarà ricevuta e confermata la propria email.<br /><br />Se si utilizza un sistema antispam che spedisce richieste di conferma allora assicurarsi di accreditare l'indirizzo webmaster@openstreetmap.org altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma.
+      flash create success message: Grazie per l'iscrizione. Abbiamo spedito un messaggio di conferma all'indirizzo {{email}} e non appena sarà confermato il proprio profilo sarà possibile mappare.<br /><br />Se si utilizzano dei filtri antispam che inviano delle richieste di conferma assicurarsi che l'indirizzo webmaster@openstreetmap.org sia nella whitelist, altrimenti non saremo in grado di rispondere ad alcuna richiesta di conferma.
       heading: Crea un profilo utente
       license_agreement: Quando confermi il tuo profilo devi accettare le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">regole per contribuire</a>.
       no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo.
index f857986a9b07f82811350c01cbe60e4aa6bb21f6..a5b863ef0672d18f886db41b6dcb063fec3add8d 100644 (file)
@@ -5,6 +5,7 @@
 # Author: Higa4
 # Author: Hosiryuhosi
 # Author: Mage Whopper
+# Author: Miya
 # Author: Nazotoko
 # Author: 青子守歌
 ja: 
@@ -1128,6 +1129,8 @@ ja:
       trackable: 追跡可能  (匿名でのみ共有されるが、点の順序はタイムスタンプ付きでわかる。)
   user: 
     account: 
+      contributor terms: 
+        link text: これは何ですか?
       current email address: 現在の電子メールアドレス:
       delete image: 現在の画像を削除
       email never displayed publicly: (公開しません)
@@ -1154,11 +1157,13 @@ ja:
         heading: "公開編集:"
       public editing note: 
         heading: 公開編集
+      replace image: 現在の画像と置換
       return to profile: プロフィールに戻る
       save changes button: 変更を保存
       title: アカウントを編集
       update home location on click: クリックした地点をあなたの活動地域として登録を更新しますか?
     confirm: 
+      already active: このアカウントはすでに確認されています。
       button: 確認
       heading: ユーザアカウントの確認
       press confirm button: アカウントを有効にして良ければ、以下の確認ボタンを押してください。
@@ -1169,6 +1174,9 @@ ja:
       heading: 電子メールアドレス変更の確認
       press confirm button: 新しいメールアドレスを確認するために確認ボタンを押して下さい。
       success: あなたのメールアドレスが確認できました。登録ありがとうございます。
+    confirm_resend: 
+      failure: "{{name}}というアカウントは登録されていません。"
+      success: " {{email}}に確認メッセージを再送信しました。電子メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。"
     filter: 
       not_an_administrator: この作業を行うには、管理者になる必要があります。
     go_public: 
@@ -1178,6 +1186,8 @@ ja:
       empty: 条件に一致するユーザーが見つかりません
       heading: 利用者
       hide: 選択したユーザーを隠す
+      summary: "{{name}} は {{ip_address}}から{{date}}に作成されました。"
+      summary_no_ip: "{{name}} は{{date}}に作成されました。"
       title: ユーザー
     login: 
       account not active: 申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。
@@ -1217,9 +1227,9 @@ ja:
       display name description: あなたのユーザー名は投稿者として公開されます。これは設定から変更できます。
       email address: "Eメールアドレス:"
       fill_form: 以下のフォームを埋めてください。登録すると、あなたのアカウントを有効化するためにあなたにメールをお送りします。
-      flash create success message: ユーザ作成に成功しました。すぐに編集を開始するために電子メールを確認してアカウントを有効にしてください。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。<br /><br />メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。
+      flash create success message: "{{email}}に確認メッセージを送信しました。電子メールを確認してアカウントを有効にし次第、編集を開始できます。<br /><br />あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。"
       heading: ユーザアカウントの作成
-      license_agreement: アカウントを作成することで、あなたが openstreetmap.org にアップロードする全てのデータおよび作業内容、もしくは openstreetmap.org に接続するツールによる活動を全て非排他的な <a  href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコモンズ 表示-継承 (Creative Commons by-sa) ライセンス</a>で使用許諾した物と見なされます。
+      license_agreement: アカウントを確認することで、あなたが openstreetmap.org にアップロードする全てのデータおよび作業内容、もしくは openstreetmap.org に接続するツールによる活動を全て非排他的な <a  href="http://creativecommons.org/licenses/by-sa/2.0/">クリエイティブコモンズ 表示-継承 (Creative Commons by-sa) ライセンス</a>で使用許諾したものと見なされます。
       no_auto_account_create: 残念ながら、自動的にアカウントを作ることが出来ません。
       not displayed publicly: 公開されません。(詳細は <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"  title="wiki privacy policy including section on email addresses">プライバシーポリシー</a>を御覧下さい)
       password: "パスワード:"
index 124b0b80faa68e346a23da6026f05b016ed07b57..078d2bce73901f19ec9df43161ac5efb40663965 100644 (file)
@@ -147,6 +147,7 @@ lb:
     tag_details: 
       wiki_link: 
         key: D'Wiki-Beschreiwungssäit fir den {{key}}-Tag
+        tag: D'Wiki-Beschreiwungssäit fir den {{key}}={{value}}-Tag
       wikipedia_link: Den Artikel {{page}} op der Wikipedia
     timeout: 
       type: 
@@ -544,6 +545,7 @@ lb:
       map: Kaart
       none: Keen
       owner: "Besëtzer:"
+      pending: AM SUSPENS
       points: "Punkten:"
       start_coordinates: "Ufankskoordinaten:"
       uploaded: "Eropgelueden:"
@@ -571,11 +573,13 @@ lb:
       return to profile: "Zréck op de Profil:"
       save changes button: Ännerunge späicheren
     confirm: 
+      already active: Dëse Kont gouf scho confirméiert.
       button: Confirméieren
       heading: E Benotzerkont confirméieren
       press confirm button: Klickt w.e.g. op de Knäppchen confirméieren fir Äre Benotzerkont z'aktivéieren.
     confirm_email: 
       button: Confirméieren
+      heading: Eng Ännerung vun enger E-Mailadress confirméieren
     filter: 
       not_an_administrator: Dir musst Administrateur si fir déi Aktioun maachen ze kënnen.
     go_public: 
@@ -662,6 +666,7 @@ lb:
       my edits: meng Ännerungen
       my settings: meng Astellungen
       nearby users: Aner Benotzer nobäi
+      no friends: Dir hutt nach keng Frënn derbäi gesat.
       remove as friend: als Frënd ewechhuelen
       role: 
         administrator: Dëse Benotzer ass en Administrateur
@@ -711,6 +716,7 @@ lb:
       not_a_role: D'Zeechen '{{role}}' ass keng valabel Roll.
       not_an_administrator: Nëmmen Adminstrateure kënnen d'Gstioun vun de Rolle maachen, an Dir sidd net Administrateur.
     grant: 
+      are_you_sure: Sidd Dir sécher datt Dir dem Benotzer '{{name}}' d'Roll '{{role}}' zoudeele wëllt?
       confirm: Confirméieren
       heading: Confirméiert d'Zoudeele vun der Roll
       title: Confirméiert d'Zoudeele vun der Roll
index e5a1776b39b7626c3185a30dc9246988e059b072..50894bd2094d1262d0a496c71efca591807929c6 100644 (file)
@@ -349,6 +349,17 @@ mk:
       save_button: Зачувај
       title: Дневникот на {{user}} | {{title}}
       user_title: дневник на {{user}}
+  editor: 
+    default: По основно (моментално {{name}})
+    josm: 
+      description: JOSM (преку приклучок за далечинско ракување)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (уредник во прелистувач)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (уредник во прелистувач)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Додај бележник на картата
@@ -764,7 +775,7 @@ mk:
           charity: Добротворна продавница
           chemist: Аптека
           clothes: Дуќан за облека
-          computer: Ð\9aомпÑ\98Ñ\83Ñ\82еÑ\80Ñ\81ка Ð¿Ñ\80одавниÑ\86а
+          computer: Ð\9fÑ\80одавниÑ\86а Ð·Ð° Ñ\81меÑ\82аÑ\87и
           confectionery: Слаткарница
           convenience: Бакалница
           copyshop: Фотокопир
@@ -873,9 +884,10 @@ mk:
       history_zoom_alert: Морате да приближите за да можете да ја видите историјата на уредувања
   layouts: 
     copyright: Авторски права и лиценца
-    donate: Поддржете ја OpenStreetMap со {{link}} за Фондот за обнова на хардвер.
+    donate: Поддржете ја OpenStreetMap со {{link}} за Фондот за обнова на машинската опрема.
     donate_link_text: донирање
     edit: Уреди
+    edit_with: Уреди со {{editor}}
     export: Извези
     export_tooltip: Извоз на податоци од картата
     gps_traces: GPS-траги
@@ -1156,11 +1168,13 @@ mk:
     edit: 
       anon_edits_link_text: Дознајте зошто ова е така.
       flash_player_required: Ќе ви треба Flash-програм за да го користите Potlatch - Flash-уредник за OpenStreetMap. Можете да <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">го преземете Flash Player од Adobe.com</a>. Имате и <a href="http://wiki.openstreetmap.org/wiki/Editing">неколку други можности</a> за уредување на OpenStreetMap.
+      no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML, без кои оваа можност не може да работи.
       not_public: Не сте наместиле уредувањата да ви бидат јавни.
       not_public_description: Повеќе не можете да ја уредувате картата  ако не го направите тоа. Можете да наместите уредувањата да ви бидат јавни на вашата {{user_page}}.
       potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или кликнете на „зачувај“ ако го имате тоа копче.)
       user_page_link: корисничка страница
     index: 
+      josm_failed: Уредувањето не успеа - проверете дали е вчитан JOSM и дали е овозможено далечинското ракување
       js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм.
       js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта.
       js_3: Препорачуваме да ја пробате <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home статичната карта</a> ако не можете да овозможите JavaScript.
@@ -1376,6 +1390,7 @@ mk:
       new email address: "Нова е-поштенска адреса:"
       new image: Додај слика
       no home location: Немате внесено матична местоположба.
+      preferred editor: "Претпочитан урендик:"
       preferred languages: "Претпочитани јазици:"
       profile description: "Опис за профилот:"
       public editing: 
@@ -1387,7 +1402,7 @@ mk:
         heading: "Јавно уредување:"
       public editing note: 
         heading: Јавно уредување
-        text: Ð\92о Ð¼Ð¾Ð¼ÐµÐ½Ñ\82ов Ð²Ð°Ñ\88иÑ\82е Ñ\83Ñ\80едÑ\83ваÑ\9aа Ñ\81е Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¸ Ð¸ Ð»Ñ\83Ñ\93еÑ\82о Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ñ\82 Ð´Ð° Ð²Ð¸ Ð¿Ñ\80аÑ\82аÑ\82 Ð¿Ð¾Ñ\80ака Ð¸Ð»Ð¸ Ð´Ð° Ð²Ð¸ Ñ\98а Ð²Ð¸Ð´Ð°Ñ\82 Ð»Ð¾ÐºÐ°Ñ\86иÑ\98ата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
+        text: Ð\92о Ð¼Ð¾Ð¼ÐµÐ½Ñ\82ов Ð²Ð°Ñ\88иÑ\82е Ñ\83Ñ\80едÑ\83ваÑ\9aа Ñ\81е Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¸ Ð¸ Ð»Ñ\83Ñ\93еÑ\82о Ð½Ðµ Ð¼Ð¾Ð¶Ð°Ñ\82 Ð´Ð° Ð²Ð¸ Ð¿Ñ\80аÑ\82аÑ\82 Ð¿Ð¾Ñ\80ака Ð¸Ð»Ð¸ Ð´Ð° Ð²Ð¸ Ñ\98а Ð²Ð¸Ð´Ð°Ñ\82 Ð¼ÐµÑ\81Ñ\82оположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. <b>По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">дознајте зошто</a>).<ul> <li>Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.</li> <li>Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.</li> </ul>
       replace image: Замени тековна слика
       return to profile: Назад кон профилот
       save changes button: Зачувај ги промените
index d0c1ec63e4debccad54d90e169733a0a42095ce4..b71def69b81cfdebd88551317f442edbbc47ff27 100644 (file)
@@ -352,6 +352,17 @@ nl:
       save_button: Opslaan
       title: Gebruikersdagboek van {{user}} | {{title}}
       user_title: Dagboek van {{user}}
+  editor: 
+    default: Standaard (op dit moment {{name}})
+    josm: 
+      description: JOSM (via remote-control plug-in)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (in-browser kaartbewerkingsprogramma)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (in-browser kaartbewerkingsprogramma)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Marker op de kaart zetten
@@ -368,7 +379,7 @@ nl:
       manually_select: Handmatig een ander gebied selecteren
       mapnik_image: Mapnik-afbeelding
       max: max
-      options: Instellingen
+      options: Opties
       osm_xml_data: OpenStreetMap XML-gegevens
       osmarender_image: Osmarender-afbeelding
       output: Uitvoer
@@ -706,7 +717,7 @@ nl:
         place: 
           airport: Luchthaven
           city: Stad
-          country: District
+          country: Land
           county: District
           farm: Boerderij
           hamlet: Gehucht
@@ -879,6 +890,7 @@ nl:
     donate: Ondersteun OpenStreetMap door te {{link}} aan het Hardware Upgrade-fonds.
     donate_link_text: doneren
     edit: Bewerken
+    edit_with: Bewerken met {{editor}}
     export: Exporteren
     export_tooltip: Kaartgegevens exporteren
     gps_traces: GPS-tracks
@@ -1157,11 +1169,13 @@ nl:
     edit: 
       anon_edits_link_text: Lees waarom dit het geval is.
       flash_player_required: U hebt Flash-player nodig om Potlatch, de OpenStreetMap Flash-editor te gebruiken. U kunt <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash-player van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er zijn ook andere opties</a> om OpenStreetMap te bewerken.
+      no_iframe_support: Uw browser ondersteunt geen iframes HTML die nodig zijn voor deze functie.
       not_public: U hebt ingesteld dat uw bewerkingen niet openbaar zijn.
       not_public_description: U kunt de kaart niet meer bewerken, behalve als u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw {{user_page}}.
       potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen. Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt als u in livemodus bewerkt, of klikt u op de knop Opslaan.
       user_page_link: gebruikerspagina
     index: 
+      josm_failed: Het bewerken is mislukt. Zorg ervoor dat JOSM is geladen en dat de plug-in voor remote control is ingeschakeld.
       js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld.
       js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart.
       js_3: Gebruik de <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home statische tilebrowser</a> als u niet de mogelijkheid hebt om JavaScript aan te zetten.
@@ -1378,6 +1392,7 @@ nl:
       new email address: "Nieuw e-mailadres:"
       new image: Afbeelding toevoegen
       no home location: Er is geen thuislocatie ingevoerd.
+      preferred editor: "Voorkeursprogramma voor kaartbewerking:"
       preferred languages: "Voorkeurstalen:"
       profile description: "Profielbeschrijving:"
       public editing: 
index 5f4ca7ab472fe51f574d66a5b3ac0020fb7bb36a..b77f701cee74a0b75780c90e009174fa3a8f74e5 100644 (file)
           construction: Jernbane under konstruksjon
           disused: Nedlagt jernbane
           disused_station: Nedlagt jernbanestasjon
+          funicular: Kabelbane
           halt: Togstopp
           historic_station: Historisk jernbanestasjon
           junction: Jernbanekryss
           canal: Kanal
           connector: Vannveiforbindelse
           dam: Demning
+          derelict_canal: Nedlagt kanal
           ditch: Grøft
           dock: Dokk
           drain: Avløp
index f1f705505490cd1bf1da2def019ffe7c5beb9975..83a84bcd30399493cbb8ca0b561a229d94035924 100644 (file)
@@ -355,6 +355,17 @@ pl:
       save_button: Zapisz
       title: Dziennik użytkownika {{user}} | {{title}}
       user_title: Dziennik dla {{user}}
+  editor: 
+    default: Domyślnie (obecnie {{name}})
+    josm: 
+      description: JOSM (poprzez zdalnie sterowaną wtyczkę)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (edycja w przeglądarce)
+      name: Potlatch
+    potlatch2: 
+      description: Potlatch 2 (edycja w przeglądarce)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Dodaj pinezkę na mapie
@@ -923,7 +934,13 @@ pl:
   license_page: 
     foreign: 
       english_link: oryginalna angielska wersja
+      text: W przypadku konfliktu pomiędzy tą tłumaczoną stroną a {{english_original_link}}, angielska strona ma pierwszeństwo.
       title: Informacje o tłumaczeniu
+    native: 
+      mapping_link: rozpoczęcie mapowania
+      native_link: Polska wersja
+      text: Przeglądasz angielską wersję strony o prawach autorskich. Możesz wrócić do {{native_link}} tej strony albo możesz przestać czytać o prawach autorskich i {{mapping_link}}.
+      title: O stronie
   message: 
     delete: 
       deleted: Wiadomość usunięta
@@ -1411,6 +1428,7 @@ pl:
       title: Konto zawieszone
     terms: 
       agree: Akceptuję
+      consider_pd_why: co to?
       decline: Nie akceptuję
       legale_names: 
         france: Francja
index 509b5faf80cc1b733aa3d1c236d8da1525d78b55..49993ca38f258ed62e9c871bf5c82bcb09dafe4d 100644 (file)
@@ -1418,6 +1418,7 @@ ru:
       button: Подтвердить
       heading: Подтвердить учётную запись пользователя
       press confirm button: Нажмите на кнопку подтверждения ниже, чтобы активировать вашу учетную запись.
+      reconfirm: Если уже прошло достаточно времени с момента вашей регистрации, возможно, вам необходимо <a href="{{reconfirm}}">отправить себе новое подтверждение</a>.
       success: Ваша учётная запись подтверждена, спасибо за регистрацию!
       unknown token: Похоже, что такого токена не существует.
     confirm_email: 
@@ -1428,6 +1429,7 @@ ru:
       success: Ваш адрес электронной почты подтверждён, спасибо за регистрацию!
     confirm_resend: 
       failure: Участник {{name}} не найден.
+      success: Мы выслали новое письмо с подтверждением на адрес {{email}}, и как только вы подтвердите вашу учётную запись, вы можете начать работать с картами.<br /><br />Если вы используете антиспам-систему, посылающую запросы на подтверждение, пожалуйста, внесите адрес webmaster@openstreetmap.org в ваш белый список, так как мы не можем отвечать на такие запросы.
     filter: 
       not_an_administrator: Только администратор может выполнить это действие.
     go_public: 
index 995838e7cb7bc720348b8c45646c3809a1f512ba..968dc8bcfd7534854688e0d5d568f62ba3b0fdfa 100644 (file)
@@ -71,11 +71,11 @@ sq:
         prev_changeset_tooltip: Ndryshimi i ma hershēm prej {{user}}
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} ose {{edit_link}}"
-      download_xml: Merre me XML
-      edit: ndrro
+      download_xml: Shkarko në XML
+      edit: Ndrysho
       node: Pikë
       node_title: "Pika: {{node_name}}"
-      view_history: kqyre historinë
+      view_history: Shikoje historinë
     node_details: 
       coordinates: "Koordinatat:"
       part_of: "Pjesë e:"
@@ -320,6 +320,7 @@ sq:
     native: 
       mapping_link: Fillo hatrografimin
       native_link: THIS_LANGUAGE_NAME_HERE verzion
+      text: Ju po shikoni versionin në gjuhën angelze të faqes së të drejtave autoriale. Ju mund të shkoni prapa tek {{native_link}} të kësaj faqe apo mund të ndaleni së lexuari rreth të drejtave autoriale dhe {{mapping_link}}.
       title: Rreth ksaj faqeje
   message: 
     inbox: 
@@ -521,9 +522,12 @@ sq:
       title: Ndrysho akountin
       update home location on click: Ndryshoma venin kur te klikoj ne hart?
     confirm: 
+      already active: Kjo llogari tashmë është konfirmuar.
+      before you start: Ne e dimë që ju mezi po prisni të filloni punën me harta, por para se të veproni kështu, mund të plotësoni disa informata më shumë rreth vetes suaj në formën e mëposhtme.
       button: Konfirmo
       heading: Konfirmo nje akount te shfrytezuesit
       press confirm button: Shtypni butonin e mëposhtëm për të aktivizuar llogarinë tuaj.
+      reconfirm: Nëse ka kaluar një kohë qysh prej se jeni abonuar ju mund të keni nevojë për t'i <a href="{{reconfirm}}">dërguar vetës një email të ri konfirmimi</a> .
       success: Akounti juaj u konfirmua, ju falemnderit per regjistrim!
     confirm_email: 
       button: Konfirmo
@@ -599,6 +603,19 @@ sq:
       title: Ricakto fjalekalimin
     set_home: 
       flash success: Lokacioni i shtëpisë është ruajtur me sukses
+    terms: 
+      agree: Pajtohem
+      consider_pd: Përveç marrëveshjes së mësipërme, unë i konsideroj kontributet e mia të jenë në Domenin Publik
+      consider_pd_why: çfarë është kjo?
+      decline: Nuk e pranoj
+      heading: Kushtet e Kontribimit
+      legale_names: 
+        france: Francë
+        italy: Itali
+        rest_of_world: Pjesa tjetër e botës
+      legale_select: "Ju lutem zgjidhni vendin tuaj të qëndrimit:"
+      read and accept: Ju lutem lexoni marrëveshjen më poshtë dhe shtypni butonin e dakordimit për të konfirmuar se ju pranoni kushtet e kësaj marrëveshjeje për kontributin tuaj ekzistues dhe të ardhshëm.
+      title: Kushtet e Kontribimit
     view: 
       activate_user: aktivizo ket shfrytezues
       add as friend: shtoje si shoq
index 816f333e4650ae213a3ce3c159fe420578107b29..445d669f5ac86c018490940c2dcef35be3f284b8 100644 (file)
@@ -1091,7 +1091,7 @@ sv:
     list: 
       summary_no_ip: "{{name}} skapad {{date}}"
     login: 
-      account not active: Ditt konto är ännu inte aktivt.<br />Vänligen klicka länken i e-brevet med kontobekräftelsen för att aktivera ditt konto.
+      account not active: Ditt konto är inte aktivterat.<br />Vänligen klicka på länken i e-brevet med kontobekräftelsen för att aktivera ditt konto, eller <a href="{{reconfirm}}">begär ett nytt bekräftelsebrev</a>.
       auth failure: Kunde inte logga in med de uppgifterna.
       create_account: skapa ett konto
       email or username: "E-postadress eller användarnamn:"
@@ -1127,7 +1127,7 @@ sv:
       display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna.
       email address: "E-postadress:"
       fill_form: Fyll i formuläret så skickar vi ett e-brev för att aktivera ditt konto.
-      flash create success message: Användaren skapades framgångsrikt. Kontrollera din e-post för en bekräftelse, och du kommer att kunna börja kartlägga på nolltid :-) <br /><br /> Observera att du inte kommer att kunna logga in förrän du har fått och bekräftat din e-postadress. <br /><br /> Om du använder ett antispam-system som skickar iväg bekräftelsen, var då vänlig och vitlista webmaster@openstreetmap.org då vi inte kan svara på några bekräftelseförfrågningar.
+      flash create success message: Användaren skapades framgångsrikt. Kontrollera din e-post för en bekräftelse, och du kommer att kunna börja kartlägga på nolltid :-) <br /><br /> Om du använder ett antispam-system som skickar iväg bekräftelsen, var då vänlig och vitlista webmaster@openstreetmap.org då vi inte kan svara på några bekräftelseförfrågningar.
       heading: Skapa ett användarkonto
       license_agreement: När du bekräftar ditt konto måste du samtycka till <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">bidragsgivarvillkoren</a> .
       no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto åt dig automatiskt.
index 678fe9a0299d2358e74740585c94d910bbabadee..6366779694a3c1021f61030b54c266d9362e1a27 100644 (file)
@@ -6,6 +6,12 @@
 tr: 
   activerecord: 
     attributes: 
+      diary_entry: 
+        language: Dil
+        latitude: Enlem
+        longitude: Boylam
+        title: Konu
+        user: Kullanıcı
       friend: 
         friend: Arkadaş
         user: Kullanıcı
@@ -23,6 +29,7 @@ tr:
         visible: Görünür
       user: 
         description: Açıklama
+        display_name: Görünen Ad
         email: E-posta
         languages: Diller
         pass_crypt: Şifre
@@ -33,32 +40,1060 @@ tr:
       message: Mesaj
       user: Kullanıcı
   browse: 
+    changeset: 
+      changeset: "Değişiklik takımı: {{id}}"
+      changesetxml: Değişiklik takımı XML
+      download: "{{changeset_xml_link}} veya {{osmchange_xml_link}} indir"
+      feed: 
+        title: Değişiklik takımı {{id}}
+        title_comment: Değişiklik takımı {{id}} - {{comment}}
+      title: Değişiklik takımı
+    changeset_details: 
+      belongs_to: "Ait olduğu değişiklik takımı:"
+      bounding_box: Alan sınırları
+      box: alan
+      closed_at: "Kapanış tarihi:"
+      created_at: "Oluşturma tarihi:"
+      show_area_box: Alan Kutusu Görüntüle
     common_details: 
       changeset_comment: "Yorum:"
+      edited_at: "Düzenleme tarihi:"
+      edited_by: "Düzenleyen:"
+      in_changeset: "Değişiklik takımı içinde:"
+      version: "Sürüm:"
+    map: 
+      deleted: Silindi
+      larger: 
+        area: Alanı büyük haritada görüntüle
+        node: Noktayı büyük haritada görüntüle
+        way: Yolu büyük haritada görüntüle
+      loading: Yükleniyor...
+    navigation: 
+      all: 
+        next_changeset_tooltip: Sonraki değişiklik takımı
+        next_node_tooltip: Sonraki nokta
+        next_relation_tooltip: Sonraki ilişki
+        next_way_tooltip: Sonraki yol
+        prev_changeset_tooltip: Önceki değişiklik takımı
+        prev_node_tooltip: Önceki nokta
+        prev_relation_tooltip: Önceki ilişki
+        prev_way_tooltip: Önceki yol
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} veya {{edit_link}}"
+      download_xml: XML İndir
+      edit: değiştir
+      node: Nokta
+      node_title: "Nokta: {{node_name}}"
+      view_history: geçmişi görüntüle
+    node_details: 
+      coordinates: "Koordinatları:"
+      part_of: "Ortak parça:"
+    node_history: 
+      download_xml: XML indir
+      node_history: Nokta Geçmişi
+      node_history_title: "Nokta geçmişi: {{node_name}}"
+      view_details: ayrıntıları göster
+    not_found: 
+      type: 
+        changeset: değişiklik takımı
+        node: nokta
+        relation: ilişki
+        way: yol
+    paging_nav: 
+      of: toplam
+      showing_page: Gösterilen sayfa
     relation: 
       download: "{{download_xml_link}} veya {{view_history_link}}"
       download_xml: XML indir
+      relation: İlişki
+      relation_title: "Ilişki: {{relation_name}}"
       view_history: Geçmişi görüntüle
+    relation_details: 
+      members: "Elemanlar:"
+      part_of: "Ortak parça:"
+    relation_history: 
+      download: "{{download_xml_link}} veya {{view_details_link}}"
+      download_xml: XML İndir
+      relation_history: Ilişki Geçmişi
+      relation_history_title: "İlişki Geçmişi: {{relation_name}}"
+      view_details: ayrıntıları göster
+    relation_member: 
+      entry_role: "{{type}} {{name}}, {{role}} olarak"
+      type: 
+        node: Nokta
+        relation: İlişki
+        way: Yol
+    start: 
+      manually_select: Fare kullanarak farklı bir alan seç
+      view_data: Geçerli harita alanının verileri görüntüle
     start_rjs: 
       data_frame_title: Veri
+      data_layer_name: Veri
       details: Ayrıntılar
+      drag_a_box: Fare kullanarak harita üzerinde bir alan seç
       edited_by_user_at_timestamp: "[[user]] tarafından düzenlendi ([[timestamp]])"
+      history_for_feature: "[[feature]] (geçmiş)"
+      load_data: Veri Yükle
+      loading: Yükleniyor...
+      manually_select: Fare kullanarak farklı bir alan seç
+      object_list: 
+        api: Bu alanı API'dan al
+        back: Nesne listesine dön
+        details: Ayrıntılar
+        heading: Nesne listesi
+        history: 
+          type: 
+            node: Nokta [[id]]
+            way: Yol [[id]]
+        selected: 
+          type: 
+            node: Nokta [[id]]
+            way: Yol [[id]]
+        type: 
+          node: Nokta
+          way: Yol
       show_history: Geçmişi görüntüle
+      unable_to_load_size: "Yüklenemiyor: alan boyutu [[bbox_size]] çok büyük - ({{max_bbox_size}}'den küçük olması gerekir)"
       wait: Bekleyin...
+      zoom_or_select: Yakınlaştır ya da haritada bir alan seç
+    tag_details: 
+      tags: "Etiketler:"
+      wiki_link: 
+        key: "{{key}} etiketi için Viki açıklaması"
+        tag: "{{key}}={{value}} etiketi için Viki açıklaması"
+      wikipedia_link: "{{page}} hakkında Vikipedi maddesi"
+    timeout: 
+      type: 
+        changeset: değişiklik takımı
+        node: nokta
+        relation: ilişki
+        way: yol
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} veya {{edit_link}}"
+      download_xml: XML İndir
+      edit: Düzenle
+      view_history: Geçmişi görüntüle
+      way: Yol
+      way_title: "Yol: {{way_name}}"
+    way_details: 
+      nodes: "Noktalar:"
+      part_of: "Ortak parça:"
+    way_history: 
+      download: "{{download_xml_link}} veya {{view_details_link}}"
+      download_xml: XML İndir
+      view_details: ayrıntıları göster
+      way_history: Yol Geçmişi
+      way_history_title: "Yol geçmişi: {{way_name}}"
+  changeset: 
+    changeset: 
+      anonymous: Anonim
+      big_area: (büyük)
+      no_comment: (hiç)
+      no_edits: (düzenleme yok)
+      show_area_box: alanın çerçevesi görüntüle
+      still_editing: (Hala düzenlemekte)
+      view_changeset_details: Değişiklik setleri ayrıntılı görüntüle
+    changeset_paging_nav: 
+      next: Sonraki &raquo;
+      previous: "&laquo; Önceki"
+      showing_page: "Gösterilen sayfa: {{page}}"
+    changesets: 
+      area: Alan
+      comment: Yorum
+      id: 'NO'
+      saved_at: Kaydetme Tarih
+      user: Kullanıcı
+    list: 
+      description: Son değişiklikler
+      description_bbox: "{{bbox}} alanındaki bulunan harita değişiklik setleri"
+      description_user: "{{user}} tarafından değişiklik setleri"
+      description_user_bbox: "{{user}} tarafından {{bbox}} alanındaki değişiklik setleri"
+      heading: Değişiklik Setleri
+      heading_bbox: Değişiklik Setleri
+      heading_user: Değişiklik Setleri
+      heading_user_bbox: Değişiklik Setleri
+      title: Değişiklik Setleri
+      title_bbox: "{{bbox}} alanındaki bulunan harita değişiklik setleri"
+      title_user: "{{user}} tarafından değişiklik setleri"
+      title_user_bbox: "{{user}} tarafından {{bbox}} alanındaki değişiklik setleri"
+  diary_entry: 
+    diary_comment: 
+      comment_from: "{{link_user}} tarafından {{comment_created_at}} tarihindeki yorum"
+      confirm: Onayla
+      hide_link: Bu yorum gizle
+    diary_entry: 
+      comment_count: 
+        one: 1 yorum
+        other: "{{count}} yorum"
+      comment_link: Bu girdisi yorumla
+      confirm: Onayla
+      edit_link: Bu girdisi düzenle
+      hide_link: Bu girdisi gizle
+      posted_by: "{{link_user}} tarafından {{created}} tarihinde {{language_link}} dilinde gönderildi"
+      reply_link: Bu girdisi yanıtla
+    edit: 
+      body: "Mesaj:"
+      language: "Dil:"
+      latitude: "Enlem:"
+      location: "Konum:"
+      longitude: "Boylam:"
+      marker_text: Girdisinin konumu
+      save_button: Kaydet
+      subject: "Konu:"
+      title: Günlük girdisi düzenle
+      use_map_link: Haritayı kullanarak belirt
+    feed: 
+      all: 
+        title: OpenStreetMap günlük girdileri
+      language: 
+        description: Kullanıcıların {{language_name}} dillindeki en son günlük girdileri
+        title: "{{language_name}} dillindeki günlük girdileri"
+      user: 
+        description: "{{user}} tarafından haritacılık konusunda yazdığı en son günlük girdileri"
+        title: "{{user}} tarafından haritacılık konusunda yazdığı günlük girdileri"
+    list: 
+      in_language_title: "{{language}} dillindeki günlük kayıtları"
+      new: Yeni Günlük Kayıdı
+      new_title: Yeni bir kayıt ekle günlüğünde
+      newer_entries: Daha yeni kayıtlar
+      no_entries: Günlük girdisi yok
+      older_entries: Daha eski kayıtlar
+      recent_entries: "Son günlük kayıtları:"
+      title: Kullanıcıların günlükleri
+      user_title: "{{user}} (Günlük)"
+    location: 
+      edit: Düzenle
+      location: "Konum:"
+      view: Göster
+    new: 
+      title: Yeni Günlük Girdisi
+    view: 
+      leave_a_comment: Yorum yaz
+      login: Giriş
+      login_to_leave_a_comment: Yorum yazmak için {{login_link}}
+      save_button: Kaydet
+      title: "{{user}} (günlük) | {{title}}"
+      user_title: "{{user}} (Günlük)"
+  editor: 
+    default: Varsayılan (kullanılan {{name}})
+    josm: 
+      description: JOSM (uzaktan kumanda eklentisi kullanarak)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (flash tarayıcı düzenleyici, eski)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (flash tarayıcı düzenleyici, yeni)
+      name: Potlatch 2
+  export: 
+    start: 
+      add_marker: Haritaya bir işaret ekle
+      area_to_export: Dışalım alanı
+      embeddable_html: Gömülebilir HTML
+      export_button: Dışalım
+      export_details: OpenStreetMap veri, <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 lisansı</a> altında lisanslanmıştır.
+      format: Biçim
+      format_to_export: Dışalım biçimi
+      image_size: Resim Boyutu
+      latitude: "Enlem:"
+      licence: Lisans
+      longitude: "Boylam:"
+      manually_select: Fare kullanarak farklı bir alan seç
+      mapnik_image: Mapnik resim
+      max: maks.
+      options: Seçenekler
+      osm_xml_data: OpenStreetMap XML Veri
+      osmarender_image: Osmarender resim
+      output: Çıktı
+      paste_html: Aşağıdaki HTML kopyalayıp websitesinde yapıştırabilirsin
+      scale: Ölçek
+      too_large: 
+        body: Bu alan OpenStreetMap XML verisi olarak verilmesine kadar büyüktür. Lütfen yakınlaştır veya daha küçük bir alan seç.
+        heading: Alan Çok Büyük
+      zoom: Yakınlaştır
+    start_rjs: 
+      add_marker: Haritaya bir işareti ekle
+      change_marker: İşaretinin konumu değiştir
+      click_add_marker: İşareti eklemek için harita üzerine tıklayınız
+      drag_a_box: Fare kullanarak harita üzerinde bir alan seç
+      export: Dışalım
+      manually_select: Fare kullanarak farklı bir alan seç
+      view_larger_map: Haritayı daha büyük göster
+  geocoder: 
+    description: 
+      title: 
+        geonames: <a href="http://www.geonames.org/">GeoNames</a> tarafından konum
+        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a> tarafından konum
+      types: 
+        cities: Büyükşehirler
+        places: Yerler
+        towns: Şehirler
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} - {{type}}"
+    direction: 
+      east: doğu
+      north: kuzey
+      north_east: kuzey-doğu
+      north_west: kuzey-batı
+      south: güney
+      south_east: güney-doğu
+      south_west: güney-batı
+      west: batı
+    distance: 
+      one: yaklaşık 1km
+      other: yaklaşık {{count}}km
+      zero: 1km'den az
+    results: 
+      more_results: Daha fazla sonuç
+      no_results: Sonuç bulunamadı
+    search: 
+      title: 
+        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>'dan sonuçları
+        geonames: <a href="http://www.geonames.org/">GeoNames.org</a>'un sonuçları
+        latlon: <a href="http://openstreetmap.org/">OSM</a>'un sonuçları
+        osm_namefinder: <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Ad Bulucu</a>
+        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OSM Nominatim</a> sonuçları
+        uk_postcode: <a href="http://www.npemap.org.uk/">FreeThe Postcode</a> sonuçları (İngiltere)
+        us_postcode: <a href="http://geocoder.us/">Geocoder.us</a>'dan sonuçları
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Havaalanı
+          arts_centre: Sanat Merkezi
+          atm: Bankamatik
+          auditorium: Oditoryum
+          bank: Banka
+          bar: Bar
+          bench: Bank
+          bicycle_parking: Bisiklet Parkı
+          bicycle_rental: Bisiklet kiralama
+          brothel: Genelev
+          bureau_de_change: Döviz bürosu
+          bus_station: Otogar
+          cafe: Cafe
+          car_rental: Araba Kiralama
+          car_sharing: Araç Paylaşımı
+          car_wash: Oto Yıkama
+          casino: Kasino
+          cinema: Sinema
+          clinic: Klinik
+          club: Kulüp
+          college: Lise
+          courthouse: Adliye
+          crematorium: Krematoryum
+          dentist: Diş hekimi
+          doctors: Doktorlar
+          dormitory: Yurt
+          drinking_water: İçme Suyu
+          driving_school: Sürücü Kursu
+          embassy: Elçilik
+          emergency_phone: Acil Telefon
+          fast_food: Büfe / Fast Food
+          ferry_terminal: Feribot Terminali
+          fire_hydrant: Yangın musluğu
+          fire_station: Itfaiye
+          fountain: Fıskiye
+          fuel: Petrol ofisi
+          grave_yard: Mezarlık
+          gym: Fitness Merkezi / Spor Salonu
+          hospital: Hastane
+          hotel: Hotel
+          hunting_stand: Avcılık Standı
+          ice_cream: Dondurma
+          kindergarten: Kreş
+          library: Kütüphane
+          market: Pazar yeri
+          marketplace: Pazar yeri
+          nightclub: Gece Kulübü
+          nursery: Kreş
+          nursing_home: Huzurevi
+          office: Ofis
+          park: Park
+          parking: Otopark
+          pharmacy: Eczane
+          place_of_worship: İbadethane / Tapınak
+          police: Polis
+          post_box: Posta kutusu
+          post_office: Postane
+          preschool: Anaokulu
+          prison: Cezaevi
+          pub: Birahane
+          public_building: Kamu Binası
+          reception_area: Resepsiyon Alanı
+          recycling: Geri dönüşüm noktası
+          restaurant: Restoran
+          retirement_home: Bakımevi
+          sauna: Hamam / Sauna
+          school: Okul
+          shelter: Korunak
+          shop: Dükkan
+          shopping: Alışveriş Merkezi
+          social_club: Sosyal kulübü
+          studio: Stüdyo
+          supermarket: Süpermarket
+          taxi: Taksi
+          telephone: Telefon
+          theatre: Tiyatro
+          toilets: Tuvalet
+          townhall: Belediye binası
+          university: Üniversite
+          vending_machine: Satış makinesi
+          veterinary: Veteriner
+          waste_basket: Çöp sepeti
+          wifi: WiFi erisim noktası
+          youth_centre: Gençlik Merkezi
+        boundary: 
+          administrative: İdari Sınır
+        building: 
+          chapel: Şapel
+          church: Kilise
+          city_hall: Belediye binası
+          entrance: Bina Girişi
+          faculty: Fakülte Binası
+          farm: Çiftlik Binası
+          hospital: Hastane Binası
+          hotel: Hotel
+          house: Ev
+          industrial: Sınai Bina
+          school: Okul Binası
+          shop: Dükkan
+          stadium: Stadyum
+          store: Mağaza
+          tower: Kule
+          train_station: Gar
+          university: Üniversite Binası
+          "yes": Bina
+        highway: 
+          bridleway: At yürüyüş yolu
+          bus_guideway: Güdümlü otobüs yolu
+          bus_stop: Otobüs durağı
+          byway: Yan yolu
+          construction: İnşaa halinde yolu
+          cycleway: Bisiklet Yolu
+          distance_marker: Mil taşı
+          emergency_access_point: Acil Erişim Noktası
+          footway: Yaya yolu
+          ford: Akarsu geçidi
+          gate: Kapı
+          living_street: Yaşam sokağı
+          minor: Ufak yol
+          motorway: Otoyol
+          motorway_junction: Otoyol Kavşağı
+          motorway_link: Otoyol bağlantısı
+          path: Patika
+          pedestrian: Trafiğe kapalı yolu
+          platform: Peron
+          primary: Devlet Yolu
+          primary_link: Devlet Yolu bağlantısı
+          raceway: Koşu yolu
+          residential: Sokak
+          road: Yol
+          secondary: İl yolu
+          secondary_link: İl yolunun bağlantısı
+          service: Servis Yolu
+          services: Dinleme Tesisi
+          steps: Merdiven
+          stile: Çit basamağı
+          tertiary: Köy arası yolu
+          track: Toprak yolu
+          trail: İz
+          trunk: Bölünmüş anayol
+          trunk_link: Bölünmüş anayol bağlantısı
+          unclassified: Sınıflandırılmamış yolu
+          unsurfaced: Ham yolu
+        historic: 
+          battlefield: Savaş alanı
+          church: Kilise
+          icon: Simge
+          ruins: Harabe
+          tower: Kule
+          wreck: Batık Gemi
+        leisure: 
+          beach_resort: Plajlı tatilköyü
+          fishing: Balıkçılık alanı
+          garden: Bahçe
+          golf_course: Golf Sahası
+          ice_rink: Buz pateni
+          marina: Marina
+          miniature_golf: Minyatür Golf
+          nature_reserve: Doğa Koruma Alanı
+          park: Park
+          pitch: Spor sahası
+          playground: Çocuk parkı
+          recreation_ground: Eğlence parkı
+          slipway: Kızak yolu
+          sports_centre: Spor Merkezi
+          stadium: Stadyum
+          swimming_pool: Yüzme Havuzu
+          track: Koşuş yolu
+          water_park: Su Parkı
+        natural: 
+          bay: Koy / körfez
+          beach: Plaj
+          cape: Burun
+          cave_entrance: Mağara girişi
+          channel: Kanal
+          cliff: Uçurum
+          coastline: Sahil şeridi
+          crater: Krater
+          feature: Özelliği
+          fell: Ağaçsız tepe
+          glacier: Buzul
+          heath: Fundalık
+          hill: Tepe
+          island: Ada
+          land: Kara
+          marsh: Bataklık
+          moor: Bataklık
+          mud: Balçık
+          peak: Tepe / zirve
+          point: Nokta
+          reef: Resif
+          ridge: Sırt
+          river: Nehir
+          rock: Kayaç
+          scree: Kayşat
+          scrub: Çalılık
+          shoal: Sığlık
+          spring: Pınar
+          strait: Boğaz
+          tree: Ağaç
+          valley: Dere/vadi
+          volcano: Yanardağ
+          water: Su
+          wetland: Sulak alan
+          wetlands: Sulak Alanlar
+          wood: Orman
+        place: 
+          airport: Havaalanı
+          city: Büyükşehir / il merkezi
+          country: Ülke
+          county: İlçe
+          farm: Tarla
+          hamlet: Mezra
+          house: Ev
+          houses: Evler
+          island: Ada
+          islet: Adacık
+          locality: Yer/mevkii
+          moor: Bataklık
+          municipality: Belediye
+          postcode: Posta kodu
+          region: Bölge
+          sea: Deniz
+          state: İl
+          subdivision: Alt bölümü
+          suburb: Mahalle / Banliyö
+          town: Şehir / ilçe merkezi
+          unincorporated_area: Arazi
+          village: Köy
+        railway: 
+          abandoned: Terkedilmiş Demiryolu
+          construction: Yapım aşamasında Demiryolu
+          disused: Kullanılmayan Demiryolu
+          disused_station: Kullanılmayan Tren İstasyonu
+          halt: Tren Durağı
+          junction: Demiryolu Kavşağı
+          level_crossing: Demiryolu Geçidi
+          light_rail: Dar raylı demiryolu
+          platform: Peron
+          station: Tren istasyonu
+          subway: Metro istasyonu
+          subway_entrance: Metro Giriş
+          switch: Demiryolu makası
+          tram: Tramvay
+          tram_stop: Tramvay Durağı
+        shop: 
+          alcohol: Tekel bayii
+          books: Kitap Evi
+          butcher: Kasap
+          car_repair: Oto tamir
+          carpet: Halı Dükkanı
+          gift: Hediye eşya
+          market: Market
+          shopping_centre: Alışveriş Merkezi
+          supermarket: Süpermarket
+          travel_agency: Seyahat Acentası
+          wine: Şarap evi
+        tourism: 
+          alpine_hut: Dağ evi
+          artwork: Sanat eseri
+          attraction: Gezelim görelim yeri
+          bed_and_breakfast: Oda Kahvaltı
+          cabin: Dam
+          camp_site: Kamp yeri
+          caravan_site: Karavan yeri
+          chalet: Yayla evi
+          guest_house: Konuk Evi
+          hotel: Hotel
+          information: Turist Enformasyon
+          lean_to: Ek binası
+          motel: Motel
+          museum: Müze
+          picnic_site: Piknik yeri
+          theme_park: Lunapark
+          valley: Dere/vadi
+          viewpoint: Panoramik view
+          zoo: Hayvanat bahçesi
+        waterway: 
+          canal: Kanal
+  javascripts: 
+    map: 
+      base: 
+        cycle_map: Topoğrafik Haritası
+        noname: Arkaplan Boş
+    site: 
+      edit_disabled_tooltip: Harita düzenlemek için yakınlaştırmak gerek
+      edit_zoom_alert: Harita düzenleyebilmek için yakınlaştırman gerek
+  layouts: 
+    copyright: Telif hakkı & Lisans
+    donate: OpenStreetMap {{link}} ile Donanım Yükseltme Fonu'na destek veriniz.
+    donate_link_text: Bağış
+    edit: Düzenle
+    edit_with: "{{editor}} kullanarak düzenle"
+    export: Dışalım
+    export_tooltip: Harita verisinin dışalımı
+    gps_traces: GPS İzleri
+    gps_traces_tooltip: GPS izleri yönet
+    help: Yardım
+    help_title: Projenin yardım sayfaları
+    history: Geçmiş
+    home: Konum
+    home_tooltip: Kendin konuma git
+    inbox: gelen kutusu ({{count}})
+    intro_1: OpenStreetMap herkese serbest ve ücretsiz senin gibi insanlar tarafından oluşturduğu bir dünya haritasıdır.
+    intro_2: OpenStreetMap dünyanın her köşesinden ortak bir şekilde hariatları görüntülemek, düzenlemek ve serbest kullanmak sağlar.
+    intro_3: OpenStreetMap barındırma servisleri {{ucl}} ve {{bytemark}} çok teşekkür ederiz. Diğer destekçilerimizi {{partners}} listesinde bulunmaktadır.
+    intro_3_bytemark: bytemark
+    intro_3_partners: Viki
+    intro_3_ucl: UCL VR Merkezi
+    license: 
+      title: OpenStreetMap veri Creative Commons Attribution-Share Alike 2.0 Genel Lisans altında lisanslanmıştır
+    log_in: Oturum aç
+    logo: 
+      alt_text: OpenStreetMap logosu
+    logout: Çıkış
+    make_a_donation: 
+      text: Bir bağışta bulunun
+      title: OpenStreetMap para bağışı ile destek verebilirsiniz
+    news_blog: Haber Blogu
+    news_blog_tooltip: OpenStreetMap hakkında haberler, serbest kullanımda coğrafi veriler, v.b.
+    shop: Dükkan
+    shop_tooltip: OpenStreetMap markalı ürünleri
+    sign_up: Kaydol
+    sign_up_tooltip: Düzenleme moduna girmek için bir hesap oluştur
+    tag_line: Serbest Viki Dünya Haritası
+    user_diaries: Günlükler
+    view: Görüntüle
+    view_tooltip: Haritayı göster
+    welcome_user: Hoşgeldin, {{user_link}}
+    welcome_user_link_tooltip: Senin kullanıcı sayfan
+    wiki: Viki
+    wiki_title: Projenin viki sayfaları
+  license_page: 
+    native: 
+      mapping_link: harita çizmeye başla
+      native_link: THIS_LANGUAGE_NAME_HERE sürümü
+      title: Sayfa hakkında
+  message: 
+    delete: 
+      deleted: Mesaj silindi
+    inbox: 
+      date: Tarih
+      from: Gönderen
+      my_inbox: Gelen kutusu
+      outbox: Gönderilmiş kutusu
+      people_mapping_nearby: yakın çevredeki haritacılar
+      subject: Konu
+      title: Gelen Kutusu
+      you_have: "{{new_count}} yeni mesaj ve {{old_count}} eski mesaj var"
+    mark: 
+      as_read: Mesaj okundu olarak işaretlendi
+      as_unread: Mesaj okunmadı olarak işaretlendi
+    message_summary: 
+      delete_button: Sil
+      read_button: Okundu olarak işaretle
+      reply_button: Yanıtla
+      unread_button: Okunmadı olarak işaretle
+    new: 
+      back_to_inbox: Gelen kutusuna dön
+      body: Mesaj
+      message_sent: Mesaj gönderildi
+      send_button: Gönder
+      send_message_to: "{{name}}'ya yeni bir mesaj gönder"
+      subject: Konu
+      title: Mesaj Gönder
+    outbox: 
+      date: Tarih
+      inbox: gelen kutusu
+      my_inbox: Benim {{inbox_link}}
+      outbox: gönderilmiş kutusu
+      people_mapping_nearby: yakın çevredeki haritacılar
+      subject: Konu
+      title: Gönderilmiş Kutusu
+      to: Alıcı
+      you_have_sent_messages: Gönderilen iletilerin sayısı {{count}}
+    read: 
+      back_to_inbox: Gelen kutusuna dön
+      back_to_outbox: Gönderilmiş kutusuna dön
+      date: Tarih
+      from: Gönderen
+      reading_your_messages: Mesajlarını oku
+      reading_your_sent_messages: Gönderilmiş mesajlarını oku
+      reply_button: Yanıtla
+      subject: Konu
+      title: Mesaj oku
+      to: Alıcı
+      unread_button: Okunmadı olarak işaretle
+    sent_message_summary: 
+      delete_button: Sil
+  notifier: 
+    diary_comment_notification: 
+      hi: Merhaba {{to_user}},
+      subject: "[OpenStreetMap] günlük kayıdın {{user}} tarafından yorumlandı"
+    email_confirm: 
+      subject: "[OpenStreetMap] E-posta adresi onaylama mesajı"
+    email_confirm_html: 
+      greeting: Merhaba,
+    email_confirm_plain: 
+      greeting: Merhaba,
+    friend_notification: 
+      had_added_you: Kullanıcı {{user}} seni arkadaş olarak OpenStreetMap'te ekledi.
+      subject: "[OpenStreetMap] kullanıcı {{kullanıcı}} seni arkadaş olarak ekledi"
+    gpx_notification: 
+      failure: 
+        failed_to_import: "GPX dosyası alınamadı. Hata bu:"
+        subject: "[OpenStreetMap] GPX dosyası maalesef alınamadı"
+      greeting: Merhaba,
+      success: 
+        subject: "[OpenStreetMap] GPX dosyası başarıyla alındı"
+    lost_password_html: 
+      greeting: Merhaba,
+    lost_password_plain: 
+      greeting: Merhaba,
+    message_notification: 
+      hi: Merhaba {{to_user}},
+    signup_confirm: 
+      subject: "[OpenStreetMap] e-posta adresi onaylama mesajı"
+    signup_confirm_html: 
+      greeting: Merhaba!
+      introductory_video: "{{introductory_video_link}} seyretebilirsin."
+      video_to_openstreetmap: OpenStreetMap tanıtım filmi
+    signup_confirm_plain: 
+      greeting: Merhaba!
+  oauth_clients: 
+    index: 
+      title: OAuth Ayrıntılarım
+  site: 
+    edit: 
+      user_page_link: kullanıcı sayfası
+    index: 
+      js_2: OpenStreetMap harita gösterim için JavaScript kullanıyor.
+      license: 
+        project_name: OpenStreetMap projesi
+      permalink: Kalıcı Bağlantı
+      shortlink: Kıpkısa Bağlantı
+    key: 
+      map_key_tooltip: Haritanın lejant
+      table: 
+        entry: 
+          admin: İdari sınırı
+          allotments: Bostan
+          apron: 
+            - Havaalanı apronu
+            - terminal
+          bridleway: Binici yolu
+          brownfield: Nadas
+          building: Önemli yapı
+          byway: Yan yolu
+          cable: 
+            - Teleferik
+            - gondol
+          cemetery: Mezarlık
+          centre: Spor merkezi
+          commercial: Ticari bölge
+          cycleway: Bisiklet yolu
+          farm: Çiftlik
+          footway: Yaya yolu
+          forest: Orman
+          heathland: Fundalık
+          industrial: Sanayi bölgesi
+          lake: 
+            - Göl
+            - Baraj
+          military: Askeri bölge
+          motorway: Otoyol
+          park: Park
+          pitch: Spor sahası
+          primary: Devlet Yolu
+          private: Özel giriş
+          rail: Demiryolu
+          reserve: Doğa koruma alanı
+          resident: Yerleşim bölgesi
+          retail: Alışveriş merkezi
+          runway: 
+            - Uçuş pisti
+            - Uçak pisti
+          school: 
+            - Okul
+            - Üniversite
+          secondary: İl yolu
+          station: Gar
+          subway: Metro
+          summit: 
+            - Zirve
+            - Dağ
+          tourist: Turistik yer
+          tram: 
+            - Dar raylı demiryolu
+            - tramvay
+          trunk: Bölünmüş anayol
+          wood: Orman
+    search: 
+      search: Ara
+      search_help: "örneğin: 'demirkazık', 'istiklal caddesi, istanbul', '50500', veya 'post office near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>daha fazla örnek...</a>"
+      submit_text: Git
+      where_am_i: Neredeyim ben?
+      where_am_i_title: Arama motoru kullanarak geçerli konumunu tanımlar
+    sidebar: 
+      close: Kapat
+      search_results: Arama Sonuçları
+  time: 
+    formats: 
+      friendly: "%e %B %Y saat %H:%M"
   trace: 
+    create: 
+      trace_uploaded: GPX dosya yüklendi ve veritabanına eklemek için bekliyor. Bu işlem genellikle yarım saat içinde gerçekleşir ve tamamlandığında sana bir e-posta gönderiliyor.
+      upload_trace: GPS İzi Gönder
     edit: 
       description: "Açıklama:"
+      download: indir
+      edit: düzenle
+      filename: "Dosya adı:"
+      heading: "{{name}} izini düzenleniyor"
       map: harita
+      owner: "Sahibi:"
+      points: "Nokta sayısı:"
       save_button: Değişiklikleri Kaydet
+      start_coord: "Başlangıç koordinat:"
       tags: "Etiketler:"
       tags_help: virgülle ayrılmış
+      uploaded_at: "Gönderme tarihi:"
+      visibility: Görünürlük
+      visibility_help: Bu ne demek?
+    list: 
+      public_traces: Herkese açık GPS izleri
+      public_traces_from: "{{user}} tarafından gelen herkese açık GPS izleri"
+      tagged_with: " {{tags}} ile etiketlendi"
+      your_traces: Senin GPS izleri
+    make_public: 
+      made_public: Iz herkese açık
+    offline_warning: 
+      message: GPX dosya gönderme sistemi şu anda kullanılamıyor
     trace: 
       ago: "{{time_in_words_ago}} önce"
+      by: "yükleyen:"
       count_points: "{{count}} puan"
       edit: değiştir
+      edit_map: Haritayı Düzenle
+      identifiable: TANIMLANABİLİR
       in: içinde
       map: harita
       more: daha fazla
+      pending: BEKLEMEDE
       private: ÖZEL
+      trace_details: İz Ayrıntılarını Görüntüle
+      view_map: Harita Görüntüle
+    trace_form: 
+      description: Açıklama
+      help: Yardım
+      tags: Etiketler
+      tags_help: virgül (,) ile ayrılmış
+      upload_button: Gönder
+      upload_gpx: GPX Dosya Gönder
+      visibility: Görünürlük
+      visibility_help: Bu ne demek?
+    trace_header: 
+      see_all_traces: Tüm izleri görüntüle
+      see_your_traces: Bütün kendi izlerini görüntüle
+      upload_trace: GPS izi gönder
+      your_traces: Sadece kendi izlerini görüntüle
+    trace_optionals: 
+      tags: Etiketler
     trace_paging_nav: 
+      next: Sonraki &raquo;
       previous: "&laquo; Önceki"
+      showing_page: Sayfa {{page}} görüntüleniyor
+    view: 
+      delete_track: Bu izi sil
+      description: "Açıklama:"
+      download: indir
+      edit: düzenle
+      edit_track: Bu iz düzenle
+      filename: "Dosya Adı:"
+      heading: İz {{name}} görüntüleniyor
+      map: harita
+      none: Hiç
+      owner: "Gönderen:"
+      pending: BEKLEMEDE
+      points: "Nokta sayısı:"
+      start_coordinates: "Başlangıç koordinat:"
+      tags: "Etiketler:"
+      title: "{{name}} gpx dosyası görüntüleniyor"
+      trace_not_found: İz bulunmadı!
+      uploaded: "Yüklendi:"
+      visibility: "Görünürlük:"
+  user: 
+    account: 
+      contributor terms: 
+        heading: "Katılımcı Şartları:"
+        link text: nemiş bu?
+      current email address: "Geçerli E-posta Adresi:"
+      delete image: Geçerli resim kaldır
+      email never displayed publicly: (asla genel olarak görüntülenir)
+      flash update success: Kullanıcı bilgisi başarıyla güncellendi.
+      flash update success confirm needed: Kullanıcı bilgisi başarıyla güncellendi. Yeni e-posta adresinizi onaylamak için e-mail'inizi lütfen kontrol ediniz.
+      home location: "Konum:"
+      image: "Resim:"
+      image size hint: (100x100 olan kare görüntüleri en iyi görünür)
+      keep image: Geçerli resim dursun
+      latitude: "Enlem:"
+      longitude: "Boylam:"
+      make edits public button: Bütün girdiklerim herkese açık olsun
+      my settings: Profil ayarlarım
+      new email address: "Yeni E-posta Adresi:"
+      new image: Resim ekle
+      no home location: Konumunu girmedin.
+      preferred editor: "Tercih edilen harita düzenleyici:"
+      preferred languages: "Tercih edilen diller (mesela tr,en,de):"
+      profile description: "Profil Açıklaması:"
+      public editing: 
+        disabled link text: neden düzenleyemiyorum?
+        enabled link text: bu da ne?
+        heading: "Herkese açık düzenleme modu:"
+      public editing note: 
+        heading: Herkese açık düzenleme modu
+      replace image: Geçerli resmi değiştir
+      return to profile: Profile dön
+      save changes button: Değişiklikleri Kaydet
+      title: Hesabı düzenle
+      update home location on click: Haritada tıkladığımda konumum güncelleştirilsin mi?
+    confirm: 
+      button: Onayla
+      heading: Kullanıcı hesabı onayla
+      success: Hesabın onaylandı, teşekkür ve iyi çalışmaları!<br /><br /><a href="http://wiki.openstreetmap.org/wiki/Tr:Main_Page">Hoşgeldin sayfasında</a> Türkiye'deki harita durumu konusunda bilgi alabilirsin.
+    confirm_email: 
+      success: E-posta adresinizi doğrulandı, kaydolduğu için teşekkür ederiz! İyi çalışmaları dileriz!
+    confirm_resend: 
+      success: Yeni bir onay mesajı {{email}} adresine gönderdik. Mesajı onaylar onaylamaz haritacılığı başlayabilirsiniz.<br><br>Eğer onaylama mesajını almadısanız e-postanızın Antispam/Junk/İstenmeyen klasörüne lütfen kontrol ediniz.
+    list: 
+      heading: Kullanıcılar
+      summary_no_ip: "{{name}} {{date}} tarihinde oluşturuldu."
+      title: Kullanıcılar
+    login: 
+      account not active: Üzgünüz, hesabınız henüz aktif değil.<br />Lütfen aldığın onaylama e-postasında ki bağlantı tıkla veya <a href="{{reconfirm}}">yeni bir onaylama e-posta</a> iste.
+      auth failure: Üzgünüz, bu giriş ile oturum açılamadı.
+      create_account: Kayıt ol
+      email or username: "E-posta Adresi veya Kullanıcı Adı:"
+      heading: Giriş
+      login_button: Gir
+      lost password link: Şifren mi unuttun?
+      password: "Şifre:"
+      please login: Lütfen giriş yap veya {{create_user_link}}.
+      remember: "Beni hatırla:"
+      title: Giriş
+    logout: 
+      heading: OpenStreetMap'den çıkış
+      logout_button: Çıkış
+      title: Çıkış
+    lost_password: 
+      email address: "E-posta Adresi:"
+      heading: Şifre mi unuttun?
+      new password button: Şifreyi sıfırla
+      notice email cannot find: "Üzgünüz: bu e-posta adresi bulunamadı."
+      title: Kayıp Şifre
+    make_friend: 
+      success: "{{name}} arkadaş listesinde eklendi."
+    new: 
+      confirm email address: E-posta Adresini Onayla
+      confirm password: "Şifre Onayla:"
+      continue: Devam
+      display name: "Görünen Ad:"
+      display name description: Herkes tarafından görünen ad. Bu adı istediği zaman 'tercihlerim' bölümünde değiştirebilirsin.
+      email address: "E-posta Adresi:"
+      heading: Kullanıcı Hesabı Oluştur
+      password: "Şifre:"
+      title: Hesap oluştur
+    no_such_user: 
+      body: Üzgünüz, {{user}} adlı bir kullanıcı yok. Lütfen yazımınızı denetleyin veya tıkladığınız bağlantı belki yanlış idi.
+      heading: "{{user}} adlı bir kullanıcı yok."
+      title: Böyle bir kullanıcı yok
+    popup: 
+      friend: Arkadaş
+      nearby mapper: Komşu haritacı
+      your location: Konumum
+    remove_friend: 
+      success: "{{name}} arkadaş listesinden çıkarıldı."
+    reset_password: 
+      confirm password: "Sifre Onayla:"
+      flash changed: Şifren başarıyla değiştirildi.
+      heading: "{{Kullanıcı}} için şifresini sıfırla"
+      password: "Şifre:"
+      reset: Şifre Sıfırla
+      title: Şifreyi sıfırla
+    set_home: 
+      flash success: Ev konumu başarıyla kaydedildi
+    suspended: 
+      heading: Hesap Askıda
+      title: Hesap Askıda
+      webmaster: site yönetici
+    terms: 
+      agree: Kabul Et
+      consider_pd_why: bu nedir?
+      decline: Reddet
+      heading: Katılımcı Şartları
+      legale_names: 
+        france: Fransa
+        italy: İtalya
+        rest_of_world: Dünyanın geri kalanı
+      legale_select: "İkamet ettiğiniz ülke seç:"
+      title: Katılımcı Şartları
+    view: 
+      add as friend: arkadaş olarak ekle
+      ago: ({{time_in_words_ago}} önce)
+      block_history: verilen engellemeleri görüntüle
+      blocks on me: engellendiklerim
+      confirm: Onayla
+      description: Açıklama
+      diary: günlük
+      edits: düzenlemeleri
+      email address: "E-posta adresi:"
+      hide_user: bu kullanıcı gizle
+      km away: "{{count}} km uzak"
+      m away: "{{count}} metre yakın"
+      mapper since: "Haritacılığın başlangıç tarihi:"
+      moderator_history: verilen engellemeleri görüntüle
+      my diary: günlüğüm
+      my edits: katkılarım
+      my settings: tercihlerim
+      my traces: GPS izlerim
+      nearby users: Yakın çevredeki başka kullanıcılar
+      new diary entry: yeni kayıt
+      no friends: Henüz herhangi bir arkadaş eklemediniz.
+      no nearby users: Yakın çevredeki herhangi başka kullanıcı henüz yok.
+      oauth settings: OAuth ayarları
+      remove as friend: Arkadaş listesinden çıkar
+      send message: mesaj gönder
+      settings_link_text: ayarları
+      spam score: "Spam puanı:"
+      status: "Durum:"
+      traces: izleri
+      user location: Kullanıcının konumu
+      your friends: Arkadaş listesi
+  user_block: 
+    blocks_on: 
+      empty: "{{name}} henüz engellenmiş değil."
+      heading: "{{name}} hakkında engelleme kayıtları"
+  user_role: 
+    revoke: 
+      confirm: Onayla
index 6bc7411a0d071dca224e7a4ae7617a564c52f69f..7b307170394177b948a0133fda6c0d362e27a17b 100644 (file)
@@ -359,6 +359,17 @@ uk:
       save_button: Зберегти
       title: Щоденник користувача {{user}} | {{title}}
       user_title: Щоденник користувача {{user}}
+  editor: 
+    default: Типовий (зараз {{name}})
+    josm: 
+      description: JOSM (через плагін дистанційного керування)
+      name: JOSM
+    potlatch: 
+      description: Потлач 1 (редактор в оглядачі)
+      name: Потлач 1
+    potlatch2: 
+      description: Потлач 2 (редактор в оглядачі)
+      name: Потлач 2
   export: 
     start: 
       add_marker: Додати маркер на мапу
@@ -886,6 +897,7 @@ uk:
     donate: Підтримайте OpenStreetMap {{link}} у фонді оновлення обладнання.
     donate_link_text: пожертвування
     edit: Правка
+    edit_with: Правити у {{editor}}
     export: Експорт
     export_tooltip: Експортувати картографічні дані
     gps_traces: GPS-треки
@@ -1169,11 +1181,13 @@ uk:
     edit: 
       anon_edits_link_text: З’ясувати в чому справа.
       flash_player_required: Для використання редактора Potlatch потрібний Flash-плеєр. Ви можете <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">завантажити Flash-плеєр з Adobe.com</a>. Існують й <a href="http://wiki.openstreetmap.org/wiki/Uk:Editing">інші можливості</a> для правки в OpenStreetMap.
+      no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї функції.
       not_public: Ви не зробили свої правки загальнодоступними.
       not_public_description: "Ви не можете більше анонімно редагувати мапу. Ви можете зробити ваші редагування загальнодоступними тут: {{user_page}}."
       potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку «зберегти», якщо ви в режимі відкладеного збереження.)
       user_page_link: сторінка користувача
     index: 
+      josm_failed: Редагування не вдалося — переконайтеся, що JOSM завантажений та втулок дистанційного керування увімкнений.
       js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript.
       js_2: OpenStreetMap використовує JavaScript для мапи.
       js_3: Ви можете спробувати <a href "http://tah.openstreetmap.org/Browse/">статичну мапу від Tiles@Home</a>, якщо ви не в змозі включити JavaScript.
@@ -1185,7 +1199,7 @@ uk:
       shortlink: Коротке посилання
     key: 
       map_key: Умовні знаки
-      map_key_tooltip: Ð£Ð¼Ð¾Ð²Ð½Ñ\96 Ð¿Ð¾Ð·Ð½Ð°Ñ\87еннÑ\8f Ð´Ð»Ñ\8f Ñ\80ендеÑ\80Ñ\96нгÑ\83 mapnik Ð½Ð° Ñ\86Ñ\8cомÑ\83 Ñ\80Ñ\96внÑ\96 Ð¼Ð°Ñ\81Ñ\88Ñ\82абÑ\83ваннÑ\8f
+      map_key_tooltip: Ð\9bегенда Ð´Ð»Ñ\8f ÐºÐ°Ñ\80Ñ\82и
       table: 
         entry: 
           admin: Адміністративна межа
@@ -1390,6 +1404,7 @@ uk:
       new email address: "Нова адреса електронної пошти:"
       new image: Додати зображення
       no home location: Ви не позначили своє основне місце розташування.
+      preferred editor: "Редактор:"
       preferred languages: "Бажані мови:"
       profile description: "Опис профілю:"
       public editing: 
index 4f312f5f95d51df04faa0b482039a07e89c303ac..30d8ad3d3521d6e8b6ac036a6fed9344882631a4 100644 (file)
@@ -120,7 +120,7 @@ vi:
         node: Xem nốt trên bản đồ rộng hơn
         relation: Xem quan hệ trên bản đồ rộng hơn
         way: Xem lối trên bản đồ rộng hơn
-      loading: Đang tải...
+      loading: Đang tải
     navigation: 
       all: 
         next_changeset_tooltip: Bộ thay đổi sau
@@ -194,7 +194,7 @@ vi:
       history_for_feature: Lịch sử [[feature]]
       load_data: Tải Dữ liệu
       loaded_an_area_with_num_features: "Bạn đã tải vùng chứa [[num_features]] nét. Một số trình duyệt không hiển thị nổi nhiều dữ liệu như thế. Nói chung, trình duyệt hoạt động tốt khi nào chỉ có 100 nét cùng lúc: hơn thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới."
-      loading: Đang tải...
+      loading: Đang tải
       manually_select: Chọn vùng khác thủ công
       object_list: 
         api: Lấy vùng này dùng API
@@ -350,6 +350,17 @@ vi:
       save_button: Lưu
       title: Nhật ký của {{user}} | {{title}}
       user_title: Nhật ký của {{user}}
+  editor: 
+    default: Mặc định (hiện là {{name}})
+    josm: 
+      description: JOSM (qua phần bổ trợ điều khiển từ xa)
+      name: JOSM
+    potlatch: 
+      description: Potlatch 1 (trình vẽ trong trình duyệt)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (trình vẽ trong trình duyệt)
+      name: Potlatch 2
   export: 
     start: 
       add_marker: Đánh dấu vào bản đồ
@@ -484,6 +495,7 @@ vi:
           preschool: Trường Mầm non
           prison: Nhà tù
           pub: Quán rượu
+          public_building: Tòa nhà Công cộng
           public_market: Chợ phiên
           restaurant: Nhà hàng
           retirement_home: Nhà về hưu
@@ -794,6 +806,7 @@ vi:
     donate: Hỗ trợ OpenStreetMap bằng cách {{link}} cho Quỹ Nâng cấp Phần cứng.
     donate_link_text: quyên góp
     edit: Sửa đổi
+    edit_with: Sửa đổi dùng {{editor}}
     export: Xuất
     export_tooltip: Xuất dữ liệu bản đồ
     gps_traces: Tuyến đường GPS
@@ -1078,16 +1091,18 @@ vi:
     edit: 
       anon_edits_link_text: Tại sao vậy?
       flash_player_required: Bạn cần có Flash Player để sử dụng Potlatch, trình vẽ OpenStreetMap bằng Flash. Bạn có thể <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">tải xuống Flash Player từ Adobe.com</a>. Cũng có sẵn <a href="http://wiki.openstreetmap.org/wiki/Editing?uselang=vi">vài cách khác</a> để sửa đổi OpenStreetMap.
+      no_iframe_support: Tính năng này cần trình duyệt hỗ trợ khung nội bộ (iframe) trong HTML.
       not_public: Bạn chưa đưa ra công khai các sửa đổi của bạn.
       not_public_description: Nếu không đưa ra công khai, bạn không còn được phép sửa đổi bản đồ. Bạn có thể đưa ra công khai tại {{user_page}}.
       potlatch_unsaved_changes: Bạn có thay đổi chưa lưu. (Để lưu trong Potlatch, hãy bỏ chọn lối hoặc địa điểm đang được chọn, nếu đến sửa đổi trong chế độ Áp dụng Ngay, hoặc bấm nút Lưu nếu có.)
       user_page_link: trang cá nhân
     index: 
+      josm_failed: Thất bại mở trình vẽ – hãy chắc chắn rằng JOSM đã khởi động và phần mở rộng điều khiển từ xa được kích hoạt
       js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript.
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
       js_3: Bạn vẫn có thể sử dụng <a href="http://tah.openstreetmap.org/Browse/">bản đồ tĩnh Tiles@Home</a> nếu không bật lên JavaScript được.
       license: 
-        license_name: Creative Commons Attribution-Share Alike 2.0
+        license_name: Creative Commons Ghi công–Chia sẻ tương tự 2.0
         notice: "{{project_name}} và những người đóng góp cho phép sử dụng theo giấy phép {{license_name}}."
         project_name: Dự án OpenStreetMap
       permalink: Liên kết Thường trực
@@ -1301,6 +1316,7 @@ vi:
       new email address: "Địa chỉ Thư điện tử Mới:"
       new image: Thêm hình
       no home location: Bạn chưa định vị trí nhà.
+      preferred editor: "Trình vẽ Ưa thích:"
       preferred languages: "Ngôn ngữ Ưu tiên:"
       profile description: "Tự giới thiệu:"
       public editing: 
@@ -1469,7 +1485,7 @@ vi:
       new diary entry: mục nhật ký mới
       no friends: Bạn chưa thêm người bạn.
       no nearby users: Không có người dùng nào nhận rằng họ ở gần.
-      oauth settings: Thiết lập OAuth
+      oauth settings: thiết lập OAuth
       remove as friend: dời người bạn
       role: 
         administrator: Người dùng này là quản lý viên
index 687ff268398f91a09902e1c876a15da8ec628c63..6e24b170de065146d407b51915b67a6d9eee2339 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Liangent
+# Author: PhiLiP
 # Author: Shizhao
 zh-CN: 
   activerecord: 
@@ -90,15 +91,16 @@ zh-CN:
       version: "版本:"
     containing_relation: 
       entry: 关系 {{relation_name}}
-      entry_role: 关系 {{relation_name}} (as {{relation_role}})
+      entry_role: 关系{{relation_name}}(作为{{relation_role}})
     map: 
       deleted: 删除
       loading: 读取中...
     node: 
-      download: "{{download_xml_link}} 或者 {{view_history_link}}"
+      download: "{{download_xml_link}}、{{view_history_link}}或{{edit_link}}"
       download_xml: 下载 XML
-      node: 结点
-      node_title: "结点: {{node_name}}"
+      edit: 编辑
+      node: 节点
+      node_title: 结点:{{node_name}}
       view_history: 查看历史
     node_details: 
       coordinates: "坐标:"
@@ -128,6 +130,12 @@ zh-CN:
     relation_history: 
       relation_history: 关系历史
       relation_history_title: "关系历史: {{relation_name}}"
+    relation_member: 
+      entry_role: "{{type}} {{name}} 作为 {{role}}"
+      type: 
+        node: 节点
+        relation: 关系
+        way: 路径
     start: 
       manually_select: 手动选择一个不同区域
       view_data: 查看关于本地图的数据
@@ -148,22 +156,22 @@ zh-CN:
     tag_details: 
       tags: "标签:"
     way: 
-      download: "{{download_xml_link}} 或 {{view_history_link}}"
+      download: "{{download_xml_link}} 或 {{view_history_link}}"
       download_xml: 下载 XML
       edit: 编辑
       view_history: 查看历史
-      way: 路
-      way_title: "路经: {{way_name}}"
+      way: 路
+      way_title: 路径:{{way_name}}
     way_details: 
-      also_part_of: 也是 {{related_ways}}路经的一部分
-      nodes: "结点:"
-      part_of: "部分:"
+      also_part_of: 也是 {{related_ways}} 路径的一部分
+      nodes: 节点:
+      part_of: 部分:
     way_history: 
       download: "{{download_xml_link}} 或者 {{view_details_link}}"
       download_xml: 下载 XML
       view_details: 查看详细情况
-      way_history: 路历史
-      way_history_title: "路经历史: {{way_name}}"
+      way_history: 路历史
+      way_history_title: 路径历史:{{way_name}}
   changeset: 
     changeset: 
       anonymous: 匿名
index 84f95c831d783755a52d1b4b1e79be1b85bf4019..94b5a9698da12fc18df4f86bdf5b73bfc7daacf4 100644 (file)
@@ -38,12 +38,14 @@ af:
   hint_saving_loading: laai/stoor data
   inspector: Inspekteur
   inspector_locked: Op slot
+  inspector_node_count: ($1 keer)
   inspector_uploading: (besig om op te laai)
   inspector_way_connects_to_principal: Verbind $1 $2 en $3 andere $4
   login_pwd: "Wagwoord:"
   login_title: Kon nie aanteken nie
   login_uid: "Gebruikersnaam:"
   more: Meer
+  "no": Nee
   nobackground: Geen agtergrond
   offset_motorway: Snelweg (D3)
   ok: Ok
@@ -55,6 +57,7 @@ af:
   preset_icon_bus_stop: Bushalte
   preset_icon_cafe: Kafee
   preset_icon_cinema: Bioskoop
+  preset_icon_ferry_terminal: Veerboot
   preset_icon_fire_station: Brandweerstasie
   preset_icon_hospital: Hospitaal
   preset_icon_hotel: Hotel
@@ -74,10 +77,13 @@ af:
   prompt_helpavailable: Nuwe gebruiker? Kyk links onder vir hulp.
   prompt_welcome: Welkom by OpenStreetMap!
   retry: Probeer weer
+  revert: Rol terug
   save: Stoor
   tip_addtag: Voeg 'n nuwe etiket by
   tip_alert: "'n Fout het voorgekom - kliek vir meer besonderhede"
   tip_options: Opsies (kies die kaart agtergrond)
   tip_photo: Laai foto's
   uploading: Besig met oplaai...
+  warning: Waarskuwing!
   way: Weg
+  "yes": Ja
diff --git a/config/potlatch/locales/be-TARASK.yml b/config/potlatch/locales/be-TARASK.yml
new file mode 100644 (file)
index 0000000..8c5b08c
--- /dev/null
@@ -0,0 +1,197 @@
+# Messages for Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: EugeneZelenko
+# Author: Jim-by
+be-TARASK: 
+  a_poi: $1 пункт інтарэсу
+  a_way: $1 дарогу
+  action_addpoint: даданьне пункту ў канец дарогі
+  action_cancelchanges: скасаваньне зьменаў да
+  action_changeway: зьмены дарогі
+  action_createpoi: стварэньне пункту інтарэсу
+  action_deletepoint: выдаленьне пункту
+  action_insertnode: даданьне пункту на дарогу
+  action_mergeways: аб'яднаньне двух дарогаў
+  action_movepoi: перанос пункту інтарэсу
+  action_movepoint: перамяшчэньне пункту
+  action_pointtags: устаноўка тэгаў на пункты
+  action_poitags: устаноўка тэгаў на пункт інтарэсу
+  action_reverseway: зьмена напрамку дарогі
+  action_revertway: вяртаньне дарогі
+  action_splitway: падзел дарогі
+  action_waytags: устаноўка тэгаў на дарогу
+  advanced: Палепшанае мэню
+  advanced_close: Закрыць набор зьменаў
+  advanced_history: Гісторыя дарогі
+  advanced_inspector: Інспэктар
+  advanced_maximise: Разгарнуць акно
+  advanced_minimise: Згарнуць акно
+  advanced_parallel: Паралельная дарога
+  advanced_tooltip: Дзеяньні палепшанага рэдагаваньня
+  advanced_undelete: Аднавіць
+  advice_bendy: Занадта выгнутае каб выпраміць (SHIFT каб выпраміць)
+  advice_deletingpoi: Выдаленьне пункту інтарэсу (Z для адмены)
+  advice_deletingway: Выдаленьне дарогі (Z для адмены)
+  advice_microblogged: "Ваш статус абноўлены: $1"
+  advice_nocommonpoint: Дарогі ня маюць агульнага пункту
+  advice_revertingpoi: Вяртаньне да апошняга захаванага пункту інтарэсу (Z для адмены)
+  advice_revertingway: Вяртаньне да апошняй захаванай вэрсіі (Z для адмены)
+  advice_tagconflict: Тэгі не супадаюць. Калі ласка, праверце (Z для адмены)
+  advice_toolong: Занадта доўгая для разблякваньня. Калі ласка, падзяліце на больш кароткія дарогі
+  advice_uploadfail: Загрузка спыненая
+  advice_uploadsuccess: Усе зьвесткі пасьпяхова загружаныя
+  cancel: Адмяніць
+  closechangeset: Закрыцьцё набору зьменаў
+  conflict_download: Загрузіць іх вэрсію
+  conflict_poichanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў пункт $1$2.
+  conflict_relchanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў адносіны $1$2.
+  conflict_visitpoi: Націсьніце 'Добра' каб паказаць пункт.
+  conflict_visitway: Націсьніце 'Добра' каб паказаць дарогу.
+  conflict_waychanged: Пасьля таго, як Вы пачалі рэдагаваньне, нехта зьмяніў дарогу $1$2.
+  createrelation: Стварыць новую сувязь
+  custom: "Нестандартная:"
+  delete: Выдаліць
+  deleting: выдаленьне
+  drag_pois: Перацягніце і адпусьціце пункты інтарэсаў
+  editinglive: Рэдагаваць ужывую
+  emailauthor: "\\n\\nКалі ласка, дашліце паведамленьне пра памылку на адрас: richard@systemeD.net, пазначыўшы якія дзеяньні Вы выконвалі."
+  error_connectionfailed: Прабачце, немагчыма злучыцца з сэрвэрам OpenStreetMap. Усе апошнія зьмены не былі захаваныя.\n\nВы жадаеце паспрабаваць зноў?
+  error_microblog_long: "Памылка адпраўкі да $1:\nHTTP-код: $2\nПаведамленьне пра памылку: $3\n$1 памылка: $4"
+  error_nopoi: Пункт інтарэсу ня знойдзены (верагодна Вы адхіліліся ў бок?), таму немагчыма адменіць.
+  error_nosharedpoint: Дарогі $1 і $2 болей не ўтрымліваюць агульных пунктаў, з-за гэтага немагчыма адмяніць падзел.
+  error_noway: Немагчыма знайсьці дарогу $1 (верагодна Вы аддаліліся), з-за гэтага немагчыма адмяніць.
+  error_readfailed: Прабачце, сэрвэр OpenStreetMap не адказаў на запыт зьвестак.\n\nВы жадаеце паспрабаваць зноў?
+  existingrelation: Дадаць у існуючыя сувязі
+  findrelation: Знайсьці адносіны, якія ўтрымліваюць
+  gpxpleasewait: Калі ласка пачакайце, пакуль GPX-трэкі апрацоўваюцца.
+  heading_drawing: Маляваньне
+  heading_introduction: Уводзіны
+  heading_pois: Пачатак працы
+  heading_quickref: Хуткая даведка
+  heading_surveying: Назіраньне
+  heading_tagging: Тэгаваньне
+  heading_troubleshooting: Вырашэньне праблемаў
+  help: Дапамога
+  hint_drawmode: націсьніце каб дадаць пункт\n, націсьніце двойчы/Return\n, каб скончыць лінію
+  hint_latlon: "шырата $1\nдаўгата $2"
+  hint_loading: загрузка зьвестак
+  hint_overpoint: над пунктам ($1)\nнацісьніце каб далучыць
+  hint_pointselected: пункт выбраны\n(націсьніце з Shift на пункт\nкаб пачаць новую лінію)
+  hint_saving: захаваньне зьвестак
+  hint_saving_loading: загрузка/захаваньне зьвестак
+  inspector: Інспэктар
+  inspector_duplicate: Дублікат
+  inspector_in_ways: У дарогах
+  inspector_latlon: "Шырата $1\nДаўгата $2"
+  inspector_locked: Заблякаваны
+  inspector_node_count: ($1 разы)
+  inspector_not_in_any_ways: Няма ні ў якой дарозе (пункту інтарэсу)
+  inspector_unsaved: Не захавана
+  inspector_uploading: (загрузка)
+  inspector_way_connects_to: Злучэньне з $1 дарогамі
+  inspector_way_connects_to_principal: Злучаецца з $1 $2 і $3 іншым $4
+  inspector_way_nodes: $1 пунктаў
+  inspector_way_nodes_closed: $1 пунктаў (закрыта)
+  loading: Загрузка…
+  login_pwd: "Пароль:"
+  login_retry: Вашае імя удзельніка не было распазнанае. Калі ласка, паспрабуйце зноў.
+  login_title: Немагчыма ўвайсьці
+  login_uid: "Імя ўдзельніка:"
+  more: Болей
+  newchangeset: "Калі ласка, паспрабуйце зноў: Potlatch пачне новы набор зьменаў."
+  "no": Не
+  nobackground: Без фону
+  norelations: Няма сувязяў у цяперашняй вобласьці
+  offset_broadcanal: Набярэжная шырокага канала
+  offset_choose: Выбраць зьмяшчэньне (m)
+  offset_motorway: Аўтамагістраль (D3)
+  offset_narrowcanal: Набярэжная вузкага каналу
+  ok: Добра
+  openchangeset: Адкрыцьцё набору зьменаў
+  option_external: "Вонкавы запуск:"
+  option_layer_cycle_map: OSM — мапа для раварыстаў
+  option_layer_maplint: OSM - Maplint (памылкі)
+  option_layer_nearmap: "Аўстралія: NearMap"
+  option_layer_ooc_25k: "Гістарычная мапа Вялікабрытаніі: 1:25k"
+  option_layer_ooc_7th: "Гістарычная мапа Вялікабрытаніі: 7th"
+  option_layer_ooc_npe: "Гістарычная мапа Вялікабрытаніі: NPE"
+  option_layer_ooc_scotland: "Гісторыя Вялікабрытаніі: Шатляндыя"
+  option_layer_os_streetview: "Вялікабрытанія: OS StreetView"
+  option_layer_streets_haiti: "Гаіці: назвы вуліц"
+  option_layer_tip: Выберыце фон для паказу
+  option_noname: Падсьвечваць дарогі без назваў
+  option_photo: "KML з фота:"
+  option_thinareas: Выкарыстоўваць больш тонкія лініі для абшараў
+  option_thinlines: Выкарыстоўваць тонкія лініі ва ўсіх маштабах
+  option_tiger: Пазначаць нязьменныя TIGER
+  option_warnings: Паказваць разгортваемыя папярэджаньні
+  preset_icon_bar: Бар
+  preset_icon_bus_stop: Аўтобусны прыпынак
+  preset_icon_cinema: Кінатэатар
+  preset_icon_convenience: Мінімаркет
+  preset_icon_disaster: Гаіцянскі будынак
+  preset_icon_ferry_terminal: Паром
+  preset_icon_fire_station: Пажарны пастарунак
+  preset_icon_hospital: Шпіталь
+  preset_icon_hotel: Гатэль
+  preset_icon_museum: Музэй
+  preset_icon_pharmacy: Аптэка
+  preset_icon_post_box: Паштовая скрыня
+  preset_icon_pub: Паб
+  preset_icon_recycling: Сьметніца
+  preset_icon_restaurant: Рэстаран
+  preset_icon_school: Школа
+  preset_icon_station: Чыгуначная станцыя
+  preset_icon_supermarket: Супэрмаркет
+  preset_icon_telephone: Тэлефон
+  preset_icon_theatre: Тэатар
+  preset_tip: Выберыце з мэню існуючыя тэгі, якія апісваюць $1
+  prompt_addtorelation: Дадаць $1 да сувязі
+  prompt_changesetcomment: "Увядзіце апісаньне Вашых зьменаў:"
+  prompt_closechangeset: Закрыць набор зьменаў $1
+  prompt_createparallel: Стварыць паралельную дарогу
+  prompt_editlive: Рэдагаваць ужывую
+  prompt_editsave: Рэдагаваньне з захаваньнем
+  prompt_helpavailable: Вы новы ўдзельнік? Націсьніце кнопку дапамогі зьлева.
+  prompt_launch: Перайсьці па вонкавай URL-спасылцы
+  prompt_live: Падчас рэдагаваньня ўжывую, кожны элемэнт, які Вы мяняеце, будзе захаваны ў базу зьвестак OpenStreetMap адразу. Гэты рэжым не рэкамэндуецца для пачаткоўцаў. Вы ўпэўнены?
+  prompt_manyways: Гэты абшар утрымлівае шмат элемэнтаў і будзе доўга загружацца. Можа лепей наблізіцца?
+  prompt_revertversion: "Вярнуцца да папярэдняй захаванай вэрсіі:"
+  prompt_savechanges: Захаваць зьмены
+  prompt_taggedpoints: Некаторыя пункты на гэтай дарозе ўтрымліваюць апісаньне ці маюць адносіны. Сапраўды выдаліць?
+  prompt_unlock: Націсьніце, каб разблякаваць
+  prompt_welcome: Вітаем у OpenStreetMap!
+  retry: Паспрабаваць
+  revert: Вярнуць
+  save: Захаваць
+  tags_backtolist: Вярнуцца да сьпісу
+  tags_descriptions: Апісаньне '$1'
+  tags_findatag: Знайсьці тэг
+  tags_findtag: Знайсьці тэг
+  tags_matching: Папулярныя тэгі, якія адпавядаюць '$1'
+  tip_addrelation: Дадаць да сувязі
+  tip_alert: Узьнікла памылка. Націсьніце, каб атрымаць падрабязнасьці
+  tip_anticlockwise: Акружная дарога супраць гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак
+  tip_clockwise: Акружная дарога па гадзіньнікавай стрэлцы — націсьніце, каб зьмяніць напрамак
+  tip_direction: Накіраваньні дарогаў — націсьніце для зьмены кірунку
+  tip_gps: Паказаць GPS-сьцежкі (G)
+  tip_noundo: Нічога да адмены
+  tip_options: Зьмена ўстановак (выберыце фон мапы)
+  tip_photo: Загрузка фота
+  tip_presettype: Выберыце які тып шаблёнаў паказваць ў мэню.
+  tip_repeattag: Паўтарыць тэг з папярэдняй выбранай дарогі (R)
+  tip_splitway: Падзяліць дарогу ў выбраным пункце (X)
+  tip_tidy: Уладкаваць пункты на дарогі (T)
+  tip_undo: Адмяніць $1 (Z)
+  uploading: Загрузка…
+  uploading_deleting_pois: Выдаленьне пунктаў інтарэсу
+  uploading_deleting_ways: Выдаленьне дарогаў
+  uploading_poi: Загрузка пункту інтарэсу $1
+  uploading_poi_name: Загрузка пункту інтарэсы $1, $2
+  uploading_relation: Загрузка сувязі $1
+  uploading_way: Загрузка дарогі $1
+  uploading_way_name: Загрузка шляху $1, $2
+  warning: Папярэджаньне!
+  way: Дарога
+  "yes": Так
index 75b11169cdf48fc63a254745ecc6f6836532460f..5789302aa82778c5edf797645c1736a34e1f05c8 100644 (file)
@@ -97,11 +97,7 @@ dsb:
   inspector_unsaved: Njeskłaźony
   inspector_uploading: (nagraśe)
   inspector_way_connects_to: Zwězuje z $1 puśami
-  inspector_way_connects_to_principal: 
-    few: Zwězuje z $1 objektami $2 a $1 objektami $4
-    one: Zwězuje z objektom $2 a objektom $4
-    other: Zwězuje z $1 objektami $2 a $1 objektami $4
-    two: Zwězuje z $1 objektoma $2 a $1 objektoma $4
+  inspector_way_connects_to_principal: Zwězuje z $1 $2 a $3 dalšnymi $4
   inspector_way_nodes: $1 sukow
   inspector_way_nodes_closed: $1 sukow (zacynjonych)
   loading: Zacytujo se...
index 9f6c0e2ae34d1027b4a6faf14e68f7a86fd70416..5af84409a834f93efa9db0cd57df37fbd85181c9 100644 (file)
@@ -98,11 +98,7 @@ hsb:
   inspector_unsaved: Njeskładowany
   inspector_uploading: (nahraće)
   inspector_way_connects_to: Zwjazuje z $1 pućemi
-  inspector_way_connects_to_principal: 
-    few: Zwjazuje z $1 objektami $2 a $1 objektami $4
-    one: Zwjazuje z objektom $2 a objektom $4
-    other: Zwjazuje z $1 objektami $2 a $1 objektami $4
-    two: Zwjazuje z $1 objektomaj $2 a $1 objektomaj $4
+  inspector_way_connects_to_principal: Zwjazuje z $1 $2 a $3 dalšimi $4
   inspector_way_nodes: $1 sukow
   inspector_way_nodes_closed: $1 sukow (žačinjenych)
   loading: Začituje so...
index 56585017df667a879927ada051f67da9be7545ab..65c6b8a59701fe66a85d95a4eccd4ca6b427328d 100644 (file)
@@ -3,6 +3,8 @@
 # Export driver: syck
 # Author: Farras
 # Author: Irwangatot
+# Author: IvanLanin
+# Author: Kenrick95
 # Author: Rodin
 id: 
   a_poi: $1 adalah POI
@@ -73,6 +75,7 @@ id:
   hint_saving: menyimpan data
   hint_saving_loading: memuat/menyimpan data
   inspector: Inspektur
+  inspector_duplicate: Duplikat dari
   inspector_latlon: "Lintang $1\nBujur $2"
   inspector_locked: Terkunci
   inspector_node_count: ($1 kali)
@@ -129,7 +132,7 @@ id:
   preset_icon_station: Stasiun kereta
   preset_icon_supermarket: Sualayan
   preset_icon_taxi: Tempat tunggu taksi
-  preset_icon_telephone: Telpon
+  preset_icon_telephone: Telepon
   preset_icon_theatre: Teater
   prompt_addtorelation: Tambahkan $1 ke hubungan
   prompt_changesetcomment: "Masukkan keterangan tentang perubahan yang Anda lakukan:"
@@ -148,6 +151,8 @@ id:
   retry: Cobalagi
   revert: Kembalikan
   save: Simpan
+  tags_descriptions: Deskripsi dari '$1'
+  tags_findtag: Temukan tag
   tip_addrelation: Tambahkan ke hubungan
   tip_addtag: Tambah tag baru
   tip_alert: Kesalahan terjadi - klik untuk lebih lanjut
index 96d27286c5f7ebe165459ccf9f68d81436b1d54b..3920d63053789f6d1a498308e6887f85726ecdbe 100644 (file)
@@ -135,7 +135,9 @@ it:
   option_layer_ooc_7th: "Storico UK: 7°"
   option_layer_ooc_npe: "Storico UK: NPE"
   option_layer_ooc_scotland: "Storico UK: Scozia"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_streets_haiti: "Haiti: nomi delle strade"
+  option_layer_surrey_air_survey: "UK: Surrey Air Survey"
   option_layer_tip: Scegli lo sfondo da visualizzare
   option_limitways: Avverti quando carichi molti dati
   option_microblog_id: "Nome microblog:"
@@ -185,9 +187,10 @@ it:
   prompt_launch: Lancia un URL esterno
   prompt_live: Nella modalità "online" ogni modifica verrà salvata immediatamente nel database di OpenStreetMap - sconsigliata per gli inesperti. Sei sicuro?
   prompt_manyways: Quest'area è molto dettagliata e serve molto tempo per caricarla. Preferisci ingrandire lo zoom?
+  prompt_microblog: Invio a $1 ($2 rimanenti)
   prompt_revertversion: "Ripristina una versione precedente:"
   prompt_savechanges: Salva le modifiche
-  prompt_taggedpoints: Alcuni dei punti di questo percorso sono etichettati. Cancellare davvero?
+  prompt_taggedpoints: Alcuni dei punti di questo percorso sono etichettati o presenti in una relazione. Sicuro di voler eliminare?
   prompt_track: Converti la tua traccia GPS in percorsi (bloccati) per la modifica.
   prompt_unlock: Clicca per sbloccare
   prompt_welcome: Benvenuti su OpenStreetMap!
@@ -198,6 +201,7 @@ it:
   tags_descriptions: Descrizioni di '$1'
   tags_findatag: Trova un tag
   tags_findtag: Trova tag
+  tags_matching: Etichette comuni corrispondenti a '$1'
   tags_typesearchterm: "Inserisci una parola da cercare:"
   tip_addrelation: Aggiungi ad una relazione
   tip_addtag: Aggiungi una nuova etichetta
index b842daef299ec01ce67264c57822ead0c66f769e..75239bcf508fe3c626f13f1ec6e78dbdc6a5511b 100644 (file)
@@ -33,6 +33,7 @@ lb:
   hint_loading: Donnéeë lueden
   inspector: Inspekter
   inspector_duplicate: Doublon vu(n)
+  inspector_in_ways: Op de Weeër
   inspector_locked: Gespaart
   inspector_node_count: ($1 mol)
   inspector_unsaved: Net gespäichert
index 6b9d1a32c44348cd1f17bbd3536bef9eac5793ce..734e50b2599aebb2c6d1fd8b3d63f4307b06b56a 100644 (file)
@@ -80,7 +80,7 @@ mk:
   heading_tagging: Означување
   heading_troubleshooting: Отстранување неисправности
   help: Помош
-  help_html: "<!--\n\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 1: Ð\92овед\n\n--><headline>Ð\94обÑ\80едоÑ\98довÑ\82е Ð²Ð¾ Potlatch</headline>\n<largeText>Potlatch Ðµ Ñ\83Ñ\80едник Ð½Ð° OpenStreetMap ÐºÐ¾Ñ\98 Ðµ Ð»ÐµÑ\81ен Ð·Ð° Ñ\83поÑ\82Ñ\80еба. Ð¦Ñ\80Ñ\82аÑ\98Ñ\82е Ð¿Ð°Ñ\82иÑ\88Ñ\82а, Ð·Ð½Ð°Ð¼ÐµÐ½Ð¸Ñ\82оÑ\81Ñ\82и, Ñ\81помениÑ\86и Ð¸ Ð¿Ñ\80одавниÑ\86и Ð¾Ð´ Ð²Ð°Ñ\88иÑ\82е GPS Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и, Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики Ð¸Ð»Ð¸ Ñ\81Ñ\82аÑ\80и ÐºÐ°Ñ\80Ñ\82и.\n\nÐ\9eвие Ñ\81Ñ\82Ñ\80аниÑ\86и Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\88 Ñ\9cе Ð²Ðµ Ð·Ð°Ð¿Ð¾Ð·Ð½Ð°Ð°Ñ\82 Ñ\81о Ð¾Ñ\81новиÑ\82е Ð½Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Potlatch, Ð¸ Ñ\9cе Ð²Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ð°Ñ\82 ÐºÐ°Ð´Ðµ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е Ð¿Ð¾Ð²ÐµÑ\9cе. Ð\9aликнеÑ\82е Ð½Ð° Ð½Ð°Ñ\81ловиÑ\82е Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е.\n\nÐ\97а Ð´Ð° Ð¸Ð·Ð»ÐµÐ·ÐµÑ\82е, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð±Ð¸Ð»Ð¾ ÐºÐ°Ð´Ðµ Ð²Ð¾Ð½ Ð¿Ñ\80озоÑ\80еÑ\86ов.\n\n</largeText>\n\n<column/><headline>Ð\9aоÑ\80иÑ\81но Ð´Ð° Ñ\81е Ð·Ð½Ð°Ðµ</headline>\n<bodyText>Ð\9dе ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\98Ñ\82е Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и!\n\nÐ\90ко Ð¸Ð·Ð±ÐµÑ\80еÑ\82е â\80\9eУÑ\80едÑ\83ваÑ\9aе Ð²Ð¾ Ð¶Ð¸Ð²Ð¾â\80\9c, Ñ\81иÑ\82е Ð¿Ñ\80омени ÐºÐ¾Ð¸ Ñ\9cе Ð³Ð¸ Ð½Ð°Ð¿Ñ\80авиÑ\82е Ð¾Ð´Ð°Ñ\82 Ð½Ð° Ð±Ð°Ð·Ð°Ñ\82а Ð´Ð¾Ð´ÐµÐºÐ° Ð³Ð¸ Ñ\86Ñ\80Ñ\82аÑ\82е - Ñ\82.е. <i>веднаÑ\88</i>. Ð\90ко Ð½Ðµ Ñ\81Ñ\82е Ñ\82олкÑ\83 Ñ\81игÑ\83Ñ\80ни Ð²Ð¾ Ð¿Ñ\80омениÑ\82е, Ð¾Ð´Ð±ÐµÑ\80еÑ\82е â\80\9eУÑ\80едÑ\83ваÑ\9aе Ñ\81о Ð·Ð°Ñ\87Ñ\83вÑ\83ваÑ\9aеâ\80\9c, Ð¸ Ñ\82ака Ð¿Ñ\80омениÑ\82е Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ð´Ñ\83Ñ\80и ÐºÐ¾Ð³Ð° Ñ\9cе Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c.\n\nСиÑ\82е Ð½Ð°Ð¿Ñ\80авени Ñ\83Ñ\80едÑ\83ваÑ\9aа Ñ\9cе Ñ\81е Ð¿Ð¾ÐºÐ°Ð¶Ð°Ñ\82 Ð¿Ð¾ Ñ\87аÑ\81-два (на Ð½ÐµÐºÐ¾Ð»ÐºÑ\83 Ð¿Ð¾Ñ\81ложени Ñ\80абоÑ\82и Ð¸Ð¼ Ñ\82Ñ\80еба ÐµÐ´Ð½Ð° Ð½ÐµÐ´ÐµÐ»Ð°). Ð\9dа ÐºÐ°Ñ\80Ñ\82аÑ\82а Ð½Ðµ Ðµ Ð¿Ñ\80икажано Ñ\81è - Ñ\82оа Ð±Ð¸ Ð±Ð¸Ð» Ð³Ð¾Ð»ÐµÐ¼ Ð½ÐµÑ\80ед. Ð\91идеÑ\98Ñ\9cи Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86иÑ\82е Ð½Ð° OpenStreetMap Ñ\81е Ð¾Ñ\82воÑ\80ен Ð¸Ð·Ð²Ð¾Ñ\80, Ð´Ñ\80Ñ\83гиÑ\82е ÐºÐ¾Ñ\80иÑ\81ниÑ\86и Ñ\81лободно Ð¿Ñ\80аваÑ\82 ÐºÐ°Ñ\80Ñ\82и Ð½Ð° ÐºÐ¾Ð¸ Ñ\81е Ð¿Ñ\80икажани Ñ\80азлиÑ\87ни Ð°Ñ\81пекÑ\82и - ÐºÐ°ÐºÐ¾ <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap (Ð\9eÑ\82воÑ\80ена Ð²ÐµÐ»Ð¾Ñ\81ипедÑ\81ка ÐºÐ°Ñ\80Ñ\82а)</a> Ð¸Ð»Ð¸ <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nÐ\97апомнеÑ\82е Ð´ÐµÐºÐ° Ð¾Ð²Ð° Ðµ <i>и</i> Ñ\83бава ÐºÐ°Ñ\80Ñ\82а (заÑ\82оа Ñ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ñ\83бави ÐºÑ\80иви Ð»Ð¸Ð½Ð¸Ð¸ Ð·Ð° ÐºÑ\80ивиниÑ\82е), Ð½Ð¾ Ð¸ Ð´Ð¸Ñ\98агÑ\80ам (заÑ\82оа Ð¿Ñ\80овеÑ\80Ñ\83ваÑ\98Ñ\82е Ð´ÐµÐºÐ° Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а Ñ\81е Ñ\81Ñ\80еÑ\9cавааÑ\82 Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86и) .\n\nÐ\94али Ð²Ð¸ Ñ\81поменавме Ð´ÐµÐºÐ° Ð½Ðµ Ñ\81мее Ð´Ð° Ñ\81е ÐºÐ¾Ð¿Ð¸Ñ\80а Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и?\n</bodyText>\n\n<column/><headline>Ð\94ознаÑ\98Ñ\82е Ð¿Ð¾Ð²ÐµÑ\9cе</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch Ð¿Ñ\80иÑ\80аÑ\87ник</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Ð\9fоÑ\88Ñ\82енÑ\81ки Ñ\81пиÑ\81оÑ\86и</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">РазговоÑ\80и (помоÑ\88 Ð²Ð¾ Ð¶Ð¸Ð²Ð¾)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">ФоÑ\80Ñ\83м</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Ð\92ики Ð½Ð° Ð·Ð°ÐµÐ´Ð½Ð¸Ñ\86аÑ\82а</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Ð\98звоÑ\80ен ÐºÐ¾Ð´ Ð½Ð° Potlatch</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 2: ÐºÐ°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е\n\n--><page/><headline>Ð\9aако Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е</headline>\n<bodyText>Сега Potlatch Ð²Ð¸ Ðµ Ð¾Ñ\82воÑ\80ен. Ð\9aликнеÑ\82е Ð½Ð° â\80\9eУÑ\80еди Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\98â\80\9c Ð·Ð° Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е\n\nÐ\97наÑ\87и Ñ\81пÑ\80емни Ñ\81Ñ\82е Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е ÐºÐ°Ñ\80Ñ\82а. Ð\9dаÑ\98леÑ\81но Ðµ Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\87не Ñ\81о Ð¿Ð¾Ñ\81Ñ\82авеÑ\9aе Ð½Ð° Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а (POI). Ð\9eвие Ð¼Ð¾Ð¶Ð°Ñ\82 Ð´Ð° Ð±Ð¸Ð´Ð°Ñ\82 Ñ\80еÑ\81Ñ\82оÑ\80ани, Ñ\86Ñ\80кви, Ð¶ÐµÐ»ÐµÐ·Ð½Ð¸Ñ\87ки Ñ\81Ñ\82аниÑ\86и...Ñ\81è Ñ\88Ñ\82о Ñ\81акаÑ\82е.</bodytext>\n\n<column/><headline>Ð\92леÑ\87еÑ\9aе Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\9aе</headline>\n<bodyText>Ð\97а Ð´Ð° Ð²Ð¸ Ð¾Ð»ÐµÑ\81ниме, Ð³Ð¸ Ð¿Ð¾Ñ\81Ñ\82авивме Ð½Ð°Ñ\98Ñ\87еÑ\81Ñ\82иÑ\82е Ð²Ð¸Ð´Ð¾Ð²Ð¸ Ð½Ð° Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI), Ð½Ð° Ð´Ð½Ð¾Ñ\82о Ð¾Ð´ ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9dа ÐºÐ°Ñ\80Ñ\82аÑ\82а Ñ\81е Ñ\81Ñ\82авааÑ\82 Ñ\81о Ð½Ð¸Ð²Ð½Ð¾ Ð¿Ð¾Ð²Ð»ÐµÐºÑ\83ваÑ\9aе Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\9aе Ð½Ð° Ñ\81аканоÑ\82о Ð¼ÐµÑ\81Ñ\82о. Ð\98 Ð½Ðµ Ð³Ñ\80ижеÑ\82е Ñ\81е Ð°ÐºÐ¾ Ð½Ðµ Ñ\81Ñ\82е Ð³Ð¾ Ð¿Ð¾Ð³Ð¾Ð´Ð¸Ð»Ðµ Ð¼ÐµÑ\81Ñ\82оÑ\82о Ð¾Ð´ Ð¿Ñ\80в Ð¿Ð°Ñ\82: Ð¼Ð¾Ð¶ÐµÑ\82е Ñ\82оÑ\87киÑ\82е Ð´Ð° Ð¿Ð¾Ð²Ð»ÐµÐºÑ\83ваÑ\82е Ð¿Ð¾Ð²Ñ\82оÑ\80но, Ñ\81è Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ñ\98а Ð½Ð°Ð¼ÐµÑ\81Ñ\82иÑ\82е Ñ\81екоÑ\98а Ñ\82оÑ\87ка ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е.\n\nÐ\9aога Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови Ñ\81о Ñ\82оа, Ñ\81Ñ\82авеÑ\82е Ð¼Ñ\83 Ð¸Ð¼Ðµ Ð½Ð° Ñ\80еÑ\81Ñ\82оÑ\80аноÑ\82 (или Ñ\86Ñ\80кваÑ\82а, Ñ\81Ñ\82аниÑ\86аÑ\82а Ð¸Ñ\82н.) Ð\9dа Ð´Ð½Ð¾Ñ\82о Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98ави Ð¼Ð°Ð»Ð° Ñ\82абела. Ð\95дна Ð¾Ð´ Ñ\81Ñ\82авкиÑ\82е Ñ\9cе Ð±Ð¸Ð´Ðµ â\80\9eимеâ\80\9c, Ð¸ Ð´Ð¾ Ð½ÐµÐ³Ð¾ â\80\9e\82Ñ\83ка Ð²Ð½ÐµÑ\81еÑ\82е Ð¸Ð¼Ðµ)â\80\9c. Ð\9aликнеÑ\82е Ð½Ð° Ñ\82оÑ\98 Ñ\82екÑ\81Ñ\82 Ð¸ Ð²Ð¿Ð¸Ñ\88еÑ\82е Ð³Ð¾ Ð¸Ð¼ÐµÑ\82о.\n\nÐ\9aликнеÑ\82е Ð´Ñ\80Ñ\83где Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð²Ð°Ñ\88аÑ\82а Ñ\82оÑ\87ка Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI), Ð¸ Ñ\82ака Ñ\9cе Ñ\81е Ð²Ñ\80аÑ\82и Ð¼Ð°Ð»Ð¸Ð¾Ñ\82 Ñ\88аÑ\80ен Ð¿Ñ\80авоаголник.\n\nÐ\9bеÑ\81но Ðµ, Ð½ÐµÐ»Ð¸? Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c (наÑ\98долÑ\83-деÑ\81но) ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови.\n</bodyText><column/><headline>Ð\94вижеÑ\9aе Ð¿Ð¾ ÐºÐ°Ñ\80Ñ\82аÑ\82а</headline>\n<bodyText>Ð\97а Ð´Ð° Ð¾Ñ\82идеÑ\82е Ð½Ð° Ð´Ñ\80Ñ\83г Ð´ÐµÐ» Ð¾Ð´ ÐºÐ°Ñ\80Ñ\82аÑ\82а, Ñ\81амо Ð¿Ð¾Ð²Ð»ÐµÑ\87еÑ\82е Ð¿Ñ\80азен Ð¿Ñ\80оÑ\81Ñ\82оÑ\80. Potlatch Ð°Ð²Ñ\82омаÑ\82Ñ\81ки Ñ\9cе Ð²Ñ\87иÑ\82а Ð½Ð¾Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и (гледаÑ\98Ñ\82е Ð½Ð°Ñ\98гоÑ\80е-деÑ\81но)\n\nÐ\92и Ñ\80ековме Ð´Ð° â\80\9eУÑ\80едиÑ\82е Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\82еâ\80\9c, Ð½Ð¾ Ð¼Ð¾Ð¶ÐµÑ\82е Ð¸ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eУÑ\80едÑ\83ваÑ\9aе Ð²Ð¾ Ð¶Ð¸Ð²Ð¾â\80\9c. Ð\9fод Ð¾Ð²Ð¾Ñ\98 Ñ\80ежим Ð¿Ñ\80омениÑ\82е Ð¾Ð´Ð°Ñ\82 Ð¿Ñ\80аво Ð²Ð¾ Ð±Ð°Ð·Ð°Ñ\82а, Ð¸ Ð·Ð°Ñ\82оа Ð½ÐµÐ¼Ð° ÐºÐ¾Ð¿Ñ\87е â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c. Ð\9eва Ðµ Ð´Ð¾Ð±Ñ\80о Ð·Ð° Ð±Ñ\80зи Ð¿Ñ\80омени Ð¸ <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">каÑ\80Ñ\82огÑ\80аÑ\84Ñ\81ки Ð°ÐºÑ\86ии</a>.</bodyText>\n\n<headline>Следни Ñ\87екоÑ\80и</headline>\n<bodyText>Ð\97адоволни Ñ\81Ñ\82е Ð¾Ð´ Ð´Ð¾Ñ\81егаÑ\88ноÑ\82о? Ð\9eдлиÑ\87но. Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aеâ\80\9c Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е ÐºÐ°ÐºÐ¾ Ð´Ð° Ð±Ð¸Ð´ÐµÑ\82е <i>виÑ\81Ñ\82инÑ\81ки</i> ÐºÐ°Ñ\80Ñ\82огÑ\80аÑ\84!</bodyText>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 3: Ð\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aе\n\n--><page/><headline>Ð\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aе Ñ\81о GPS</headline>\n<bodyText>Ð\98деÑ\98аÑ\82а Ð¿Ð¾Ð·Ð°Ð´Ð¸ OpenStreetMap  Ðµ Ñ\81оздаваÑ\9aе Ð½Ð° ÐºÐ°Ñ\80Ñ\82а Ð±ÐµÐ· Ð¾Ð³Ñ\80аниÑ\87Ñ\83ваÑ\87киÑ\82е Ð°Ð²Ñ\82оÑ\80Ñ\81ки Ð¿Ñ\80ава ÐºÐ¾Ð¸ Ð³Ð¸ Ð¸Ð¼Ð°Ð°Ñ\82 Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и. Ð\9eва Ð·Ð½Ð°Ñ\87и Ð´ÐµÐºÐ° Ð¾Ð²Ð´ÐµÑ\88ниÑ\82е ÐºÐ°Ñ\80Ñ\82и Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\82е Ð¾Ð´ Ð½Ð¸ÐºÐ°Ð´Ðµ: Ð¼Ð¾Ñ\80аÑ\82е Ñ\81амиÑ\82е Ð´Ð° Ð³Ð¸ Ð¸Ñ\81Ñ\82Ñ\80ажиÑ\82е Ñ\83лиÑ\86иÑ\82е. Ð\97а Ñ\81Ñ\80еÑ\9cа, Ð¾Ð²Ð° Ðµ Ð¼Ð½Ð¾Ð³Ñ\83 Ð·Ð°Ð±Ð°Ð²Ð½Ð¾!\nÐ\9dаÑ\98добÑ\80о Ðµ Ð´Ð° Ñ\81е Ð·ÐµÐ¼Ðµ Ñ\80аÑ\87ен GPS-Ñ\83Ñ\80ед. Ð\9fÑ\80онаÑ\98деÑ\82е Ð½ÐµÐºÐ¾Ñ\98 Ñ\80егион ÐºÐ¾Ñ\98 Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½Ðµ Ðµ Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9fÑ\80оÑ\88еÑ\82аÑ\98Ñ\82е Ð¿Ð¾ Ñ\83лиÑ\86иÑ\82е, Ð¸Ð»Ð¸ Ð¸Ð·Ð²Ð¾Ð·ÐµÑ\82е Ð³Ð¸ Ð½Ð° Ð²ÐµÐ»Ð¾Ñ\81ипед, Ð´Ñ\80жаÑ\98Ñ\9cи Ð³Ð¾ Ñ\83Ñ\80едоÑ\82 Ð²ÐºÐ»Ñ\83Ñ\87ен. Ð\9fо Ð¿Ð°Ñ\82 Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ваÑ\98Ñ\82е Ð³Ð¸ Ð¸Ð¼Ð¸Ñ\9aаÑ\82а Ð½Ð° Ñ\83лиÑ\86иÑ\82е, Ð¸ Ñ\81еÑ\82о Ð¾Ð½Ð° Ñ\88Ñ\82о Ð²Ðµ Ð¸Ð½Ñ\82еÑ\80еÑ\81иÑ\80а (Ñ\80еÑ\81Ñ\82оÑ\80ани? Ñ\86Ñ\80кви?).\n\nÐ\9aога Ñ\9cе Ð´Ð¾Ñ\98деÑ\82е Ð´Ð¾Ð¼Ð°, Ð²Ð°Ñ\88иоÑ\82 GPS-Ñ\83Ñ\80ед Ñ\9cе Ñ\81одÑ\80жи Ñ\82.н. â\80\9eзапиÑ\81ник Ð½Ð° Ñ\82Ñ\80агиâ\80\9c (tracklog) ÐºÐ¾Ñ\98 Ð¸Ð¼Ð° ÐµÐ²Ð¸Ð´ÐµÐ½Ñ\86иÑ\98а Ð·Ð° Ñ\81екаде ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81Ñ\82е Ð±Ð¸Ð»Ðµ. Ð\9fоÑ\82оа Ð¾Ð²Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð³Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ\82е Ð½Ð° OpenStreetMap.\n\nÐ\9dаÑ\98добÑ\80иоÑ\82 Ð²Ð¸Ð´ Ð½Ð° GPS-Ñ\83Ñ\80ед Ðµ Ð¾Ð½Ð¾Ñ\98 Ñ\88Ñ\82о Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ва Ñ\87еÑ\81Ñ\82о (на Ñ\81екоÑ\98а Ñ\81екÑ\83нда-две) Ð¸ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¾ Ð¿Ð°Ð¼Ñ\82еÑ\9aе. Ð\93олем Ð´ÐµÐ» Ð¾Ð´ Ð½Ð°Ñ\88иÑ\82е ÐºÐ°Ñ\80Ñ\82огÑ\80аÑ\84и ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ñ\80аÑ\87ни Garmin Ð°Ð¿Ð°Ñ\80аÑ\82и, Ð¸Ð»Ð¸ Bluetooth-Ñ\83Ñ\80еди. Ð\9dа Ð½Ð°Ñ\88еÑ\82о Ð²Ð¸ÐºÐ¸ Ñ\9cе Ð½Ð°Ñ\98деÑ\82е Ð¿Ð¾Ð´Ñ\80обни <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">анализа Ð½Ð° GPS-Ñ\83Ñ\80еди</a></bodyText>\n\n<column/><headline>Ð\9fодигаÑ\9aе Ð½Ð° Ð¿Ð°Ñ\82екаÑ\82а</headline>\n<bodyText>Сега Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° Ñ\98а Ð¿Ñ\80еÑ\84Ñ\80лиÑ\82е Ñ\82Ñ\80агаÑ\82а Ð¾Ð´ GPS-Ñ\83Ñ\80едоÑ\82. Ð\9cожеби Ñ\83Ñ\80едоÑ\82 Ð¸Ð¼Ð° Ñ\81воÑ\98а Ð¿Ñ\80огÑ\80амÑ\81ка Ð¾Ð¿Ñ\80ема, Ð¸Ð»Ð¸ Ð¿Ð°Ðº Ð¾Ð´ Ð½ÐµÐ³Ð¾ Ð¿Ð¾Ð¶Ðµ Ð´Ð° Ñ\81е ÐºÐ¾Ð¿Ð¸Ñ\80ааÑ\82 Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82еки Ð¿Ñ\80едкÑ\83 USB. Ð\90ко Ð½Ðµ Ð¼Ð¾Ð¶Ðµ, Ð¿Ñ\80обаÑ\98Ñ\82е Ð³Ð¾ <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Ð\9aако Ð¸ Ð´Ð° Ðµ, Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82екаÑ\82а Ð²Ð¾ Ñ\81екоÑ\98 Ñ\81лÑ\83Ñ\87аÑ\98 Ñ\82Ñ\80еба Ð´Ð° Ð±Ð¸Ð´Ðµ Ð²Ð¾ GPX Ñ\84оÑ\80маÑ\82.\n\nÐ\9fоÑ\82оа Ð¾Ð´ÐµÑ\82е Ð½Ð° â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c Ð¸ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ\82е Ñ\98а Ñ\82Ñ\80агаÑ\82а Ð½Ð° OpenStreetMap. Ð\9dо Ð¾Ð²Ð° Ðµ Ñ\81амо Ð¿Ñ\80виоÑ\82 Ñ\87екоÑ\80 - Ñ\82Ñ\80агаÑ\82а Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½ÐµÐ¼Ð° Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98ави Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9cоÑ\80аÑ\82е Ñ\81амиÑ\82е Ð´Ð° Ð³Ð¸ Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¸ Ð¸Ð¼ÐµÐ½Ñ\83ваÑ\82е Ñ\83лиÑ\86иÑ\82е, Ñ\81ледеÑ\98Ñ\9cи Ñ\98а Ñ\82Ñ\80агаÑ\82а.</bodyText>\n<headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ñ\82Ñ\80агаÑ\82а</headline>\n<bodyText>Ð\9fÑ\80онаÑ\98деÑ\82е Ñ\98а Ð²Ð°Ñ\88аÑ\82а Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ\82а Ñ\82Ñ\80ага Ð²Ð¾ Ñ\81пиÑ\81окоÑ\82 Ð½Ð° â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÑ\83Ñ\80едиâ\80\9c <i>веднаÑ\88 Ð´Ð¾ Ð½ÐµÐ°</i>. Potlatch Ñ\9cе Ð·Ð°Ð¿Ð¾Ñ\87не Ñ\81о Ð¾Ð²Ð°Ð° Ð²Ñ\87иÑ\82ана Ñ\82Ñ\80ага, Ð¿Ð»Ñ\83Ñ\81 Ð°ÐºÐ¾ Ð¸Ð¼Ð° Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки. Ð¡ÐµÐ³Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\86Ñ\80Ñ\82аÑ\82е!\n\n<img src=\"gps\">Ð\9cожеÑ\82е Ð¸ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¾Ð²Ð° ÐºÐ¾Ð¿Ñ\87е Ð·Ð° Ð´Ð° Ð²Ð¸ Ñ\81е Ð¿Ñ\80икажаÑ\82 GPS Ñ\82Ñ\80агиÑ\82е Ð½Ð° Ñ\81иÑ\82е ÐºÐ¾Ñ\80иÑ\81ниÑ\86и (но Ð½Ðµ Ð¿Ð°Ñ\82ниÑ\82е Ñ\82оÑ\87ки) Ð·Ð° Ñ\82ековниоÑ\82 Ñ\80еон. Ð\94Ñ\80жеÑ\82е Shift Ð·Ð° Ð´Ð° Ñ\81е Ð¿Ñ\80икажаÑ\82 Ñ\81амо Ð²Ð°Ñ\88иÑ\82е Ñ\82Ñ\80аги.</bodyText>\n<column/><headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики</headline>\n<bodyText>Ð\9dе Ð³Ñ\80ижеÑ\82е Ñ\81е Ð°ÐºÐ¾ Ð½ÐµÐ¼Ð°Ñ\82е GPS-Ñ\83Ñ\80ед. Ð\92о Ð½ÐµÐºÐ¾Ð¸ Ð³Ñ\80адови Ð¸Ð¼Ð°Ð¼Ðµ Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\84оÑ\82огÑ\80аÑ\84ии Ð²Ñ\80з ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\86Ñ\80Ñ\82аÑ\82е, Ð´Ð¾Ð±Ð¸ÐµÐ½Ð¸ Ñ\81о Ð¿Ð¾Ð´Ð´Ñ\80Ñ\88ка Ð¾Ð´ Yahoo! (благодаÑ\80име!). Ð\98злезеÑ\82е Ð¸ Ð·Ð°Ð¿Ð¸Ñ\88еÑ\82е Ð³Ð¸ Ð¸Ð¼Ð¸Ñ\9aаÑ\82а Ð½Ð° Ñ\83лиÑ\86иÑ\82е, Ð¿Ð° Ð²Ñ\80аÑ\82еÑ\82е Ñ\81е Ð¸ Ð¸Ñ\81Ñ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ð³Ð¸ Ð»Ð¸Ð½Ð¸Ð¸Ñ\82е Ð²Ñ\80з Ð½Ð¸Ð².\n\n<img src='prefs'>Ð\94околкÑ\83 Ð½Ðµ Ð³Ð»ÐµÐ´Ð°Ñ\82е Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° ÐºÐ¾Ð¿Ñ\87еÑ\82о Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aа Ð¸ Ð¿Ñ\80овеÑ\80еÑ\82е Ð´Ð°Ð»Ð¸ Ðµ Ð¾Ð´Ð±Ñ\80ано â\80\9eYahoo!â\80\9c Ð\90ко Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½Ðµ Ð³Ð¸ Ð³Ð»ÐµÐ´Ð°Ñ\82е, Ñ\82огаÑ\88 Ð²ÐµÑ\80оÑ\98аÑ\82но Ñ\82акви Ñ\81лики Ñ\81е Ð½ÐµÐ´Ð¾Ñ\81Ñ\82апни Ð·Ð° Ð²Ð°Ñ\88иоÑ\82 Ð³Ñ\80ад, Ð¸Ð»Ð¸ Ð¿Ð°Ðº Ñ\82Ñ\80еба Ð¼Ð°Ð»ÐºÑ\83 Ð´Ð° Ð¾Ð´Ð´Ð°Ð»ÐµÑ\87иÑ\82е.\n\nÐ\9dа Ð¸Ñ\81Ñ\82ово ÐºÐ¾Ð¿Ñ\87е Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aа Ð¸Ð¼Ð° Ð¸ Ð´Ñ\80Ñ\83ги Ð¸Ð·Ð±Ð¾Ñ\80и ÐºÐ°ÐºÐ¾ ÐºÐ°Ñ\80Ñ\82и Ð½Ð° Ð\91Ñ\80иÑ\82аниÑ\98а Ñ\81о Ð¸Ñ\81Ñ\82еÑ\87ени Ð¿Ñ\80ава Ð¸ OpenTopoMap. Ð¡Ð¸Ñ\82е Ñ\82ие Ñ\81е Ñ\81пеÑ\86иÑ\98ално Ð¸Ð·Ð±Ñ\80ани Ð±Ð¸Ð´ÐµÑ\98Ñ\9cи Ð½Ð¸ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ\80иÑ\81Ñ\82име- Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\98Ñ\82е Ð½Ð¸Ñ\87ии ÐºÐ°Ñ\80Ñ\82и Ð¸ Ð²Ð¾Ð·Ð´Ñ\83Ñ\88ни Ñ\84оÑ\82огÑ\80аÑ\84ии (Ð\97акониÑ\82е Ð·Ð° Ð°Ð²Ñ\82оÑ\80Ñ\81ки Ð¿Ñ\80ава Ñ\81е Ð·Ð° Ð½Ð¸ÐºÐ°Ð´Ðµ.)\n\nÐ\9fонекогаÑ\88 Ñ\81аÑ\82елиÑ\82Ñ\81киÑ\82е Ñ\81лики Ñ\81е Ð¼Ð°Ð»ÐºÑ\83 Ñ\80азмеÑ\81Ñ\82ени Ð¾Ð´ Ñ\84акÑ\82иÑ\87каÑ\82а Ð¼ÐµÑ\81Ñ\82оположба Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а. Ð\90ко Ð½Ð°Ð¸Ð´ÐµÑ\82е Ð½Ð° Ð¾Ð²Ð°, Ð´Ñ\80жеÑ\82е Ð³Ð¾ Space Ð¸ Ð²Ð»ÐµÑ\87еÑ\82е Ñ\98а Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð°Ñ\82а Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ñ\81е Ð¿Ð¾Ñ\80амнаÑ\82. Ð¡ÐµÐºÐ¾Ð³Ð°Ñ\88 Ð¸Ð¼Ð°Ñ\98Ñ\82е Ð´Ð¾Ð²ÐµÑ\80ба Ð²Ð¾ GPS Ñ\82Ñ\80агиÑ\82е, Ð° Ð½Ðµ Ñ\81аÑ\82елиÑ\82Ñ\81киÑ\82е Ñ\81лики.</bodytext>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 4: Ð¦Ñ\80Ñ\82аÑ\9aе\n\n--><page/><headline>ЦÑ\80Ñ\82аÑ\9aе Ð¿Ð°Ñ\82иÑ\88Ñ\82а</headline>\n<bodyText>Ð\97а Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82 Ð¿Ð¾Ñ\87нÑ\83ваÑ\98Ñ\9cи Ð¾Ð´ Ð¿Ñ\80азен Ð¿Ñ\80оÑ\81Ñ\82оÑ\80 Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а, Ñ\81амо ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ñ\82амÑ\83; Ð¿Ð¾Ñ\82оа Ð½Ð° Ñ\81екоÑ\98а Ñ\82оÑ\87ка Ð½Ð° Ð¿Ð°Ñ\82оÑ\82. Ð\9aога Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð´Ð²Ð° Ð¿Ð°Ñ\82и Ð¸Ð»Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Enter - Ð¿Ð¾Ñ\82оа ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½ÐµÐºÐ¾Ðµ Ð´Ñ\80Ñ\83го Ð¼ÐµÑ\81Ñ\82о Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð¿Ð°Ñ\82оÑ\82.\n\nÐ\97а Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82 Ð¿Ð¾Ñ\87нÑ\83ваÑ\98Ñ\9cи Ð¾Ð´ Ð´Ñ\80Ñ\83г Ð¿Ð°Ñ\82, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¿Ð°Ñ\82оÑ\82 Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е; Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ\82е Ñ\82оÑ\87ки Ñ\9cе Ñ\81Ñ\82анаÑ\82 Ñ\86Ñ\80вени. Ð\94Ñ\80жеÑ\82е Shift Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° ÐµÐ´Ð½Ð° Ð¾Ð´ Ð½Ð¸Ð² Ð·Ð° Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ\87неÑ\82е Ð½Ð¾Ð² Ð¿Ð°Ñ\82 Ð¾Ð´ Ñ\82аа Ñ\82оÑ\87ка. (Ð\90ко Ð½ÐµÐ¼Ð° Ñ\86Ñ\80вена Ñ\82оÑ\87ка Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86аÑ\82а, Ð½Ð°Ð¿Ñ\80авеÑ\82е Shift-клик Ð·Ð° Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98ави ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е!)\n\nÐ\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c (наÑ\98долÑ\83-деÑ\81но) ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови. Ð\97аÑ\87Ñ\83вÑ\83ваÑ\98Ñ\82е Ñ\87еÑ\81Ñ\82о, Ð²Ð¾ Ñ\81лÑ\83Ñ\87аÑ\98 Ð´Ð° Ñ\81е Ñ\98аваÑ\82 Ð¿Ñ\80облеми Ñ\81о Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82.\n\nÐ\9dе Ð¾Ñ\87екÑ\83ваÑ\98Ñ\82е Ð¿Ñ\80омениÑ\82е Ð²ÐµÐ´Ð½Ð°Ñ\88 Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ð½Ð° Ð³Ð»Ð°Ð²Ð½Ð°Ñ\82а ÐºÐ°Ñ\80Ñ\82а. Ð\97а Ð¾Ð²Ð° Ñ\82Ñ\80еба Ð´Ð° Ð¿Ð¾Ð¼Ð¸Ð½Ð°Ñ\82 Ñ\87аÑ\81-два, Ð° Ð²Ð¾ Ð½ÐµÐºÐ¾Ð¸ Ñ\81лÑ\83Ñ\87аи Ð¸ Ð´Ð¾ ÐµÐ´Ð½Ð° Ð½ÐµÐ´ÐµÐ»Ð°.\n</bodyText><column/><headline>Ð\9fÑ\80авеÑ\9aе ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86и</headline>\n<bodyText>Ð\9cногÑ\83 Ðµ Ð²Ð°Ð¶Ð½Ð¾ Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а Ð´Ð° Ð¸Ð¼Ð°Ð°Ñ\82 Ð·Ð°ÐµÐ´Ð½Ð¸Ñ\87ка Ñ\82оÑ\87ка (â\80\9eÑ\98азолâ\80\9c) ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81е Ñ\81Ñ\80еÑ\9cавааÑ\82. Ð\9eва Ð¸Ð¼ Ñ\81лÑ\83жи Ð½Ð° ÐºÐ¾Ñ\80иÑ\81ниÑ\86иÑ\82е ÐºÐ¾Ð¸ Ð¿Ð»Ð°Ð½Ð¸Ñ\80ааÑ\82 Ð¿Ð°Ñ\82 Ð·Ð° Ð´Ð° Ð·Ð½Ð°Ð°Ñ\82 ÐºÐ°Ð´Ðµ Ð´Ð° Ñ\81вÑ\80Ñ\82аÑ\82.\n\nPotlatch Ñ\81е Ð³Ñ\80ижи Ð·Ð° Ð¾Ð²Ð° Ð´Ð¾ÐºÐ¾Ð»ÐºÑ\83 Ð²Ð½Ð¸Ð¼Ð°Ñ\82елно ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е <i>Ñ\82оÑ\87но</i> Ð½Ð° Ð¿Ð°Ñ\82оÑ\82 ÐºÐ¾Ñ\98 Ð³Ð¾ Ñ\81вÑ\80зÑ\83ваÑ\82е. Ð\93ледаÑ\98Ñ\82е Ð³Ð¸ Ð¾Ð»ÐµÑ\81ниÑ\82елниÑ\82е Ð·Ð½Ð°Ñ\86и: Ñ\82оÑ\87киÑ\82е Ñ\81веÑ\82нÑ\83вааÑ\82 Ñ\81ино, ÐºÑ\83Ñ\80Ñ\81оÑ\80оÑ\82 Ñ\81е Ð¼ÐµÐ½Ñ\83ва, Ð¸ ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови, Ñ\82оÑ\87каÑ\82а Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86аÑ\82а Ð¸Ð¼Ð° Ñ\86Ñ\80на ÐºÐ¾Ð½Ñ\82Ñ\83Ñ\80а.</bodyText>\n<headline>Ð\9fомеÑ\81Ñ\82Ñ\83ваÑ\9aе Ð¸ Ð±Ñ\80иÑ\88еÑ\9aе</headline>\n<bodyText>Ð\9eва Ñ\80абоÑ\82и Ð±Ð°Ñ\88 ÐºÐ°ÐºÐ¾ Ñ\88Ñ\82о Ñ\81е Ð±Ð¸ Ñ\81е Ð¾Ñ\87екÑ\83вало. Ð\97а Ð´Ð° Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е Ñ\82оÑ\87ка, Ð¾Ð´Ð±ÐµÑ\80еÑ\82е Ñ\98а Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Ð½Ð° Delete. Ð\97а Ð´Ð° Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е Ñ\86ел ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82, Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Shift-Delete.\n\nÐ\97а Ð´Ð° Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82иÑ\82е Ð½ÐµÑ\88Ñ\82о, Ñ\81амо Ð¿Ð¾Ð²Ð»ÐµÑ\87еÑ\82е Ð³Ð¾. (Ð\8cе Ñ\82Ñ\80еба Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð¸ Ð´Ð° Ð¿Ð¾Ð´Ñ\80жиÑ\82е Ð¼Ð°Ð»ÐºÑ\83 Ð¿Ñ\80ед Ð´Ð° Ð²Ð»ÐµÑ\87еÑ\82е. Ð¡Ð¾ Ð¾Ð²Ð° Ñ\81е Ð¸Ð·Ð±ÐµÐ³Ð½Ñ\83вааÑ\82 Ð½ÐµÐ½Ð°Ð¼ÐµÑ\80ни Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82Ñ\83ваÑ\9aа.)</bodyText>\n<column/><headline>Ð\9fонапÑ\80едно Ñ\86Ñ\80Ñ\82аÑ\9aе</headline>\n<bodyText><img src=\"scissors\">Ð\90ко Ð´Ð²Ð° Ð´ÐµÐ»Ð° Ð¾Ð´ ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82 Ð¸Ð¼Ð°Ð°Ñ\82 Ñ\80азлиÑ\87ни Ð¸Ð¼Ð¸Ñ\9aа, Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° Ð³Ð¸ Ñ\80аздвоиÑ\82е. Ð\9aликнеÑ\82е Ð½Ð° Ð¿Ð°Ñ\82оÑ\82; Ð¿Ð¾Ñ\82оа ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð²Ð¾ Ñ\82оÑ\87каÑ\82а ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е Ð´Ð° Ð³Ð¾ Ñ\80аздвоиÑ\82е, Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½Ð¾Ð¶Ð¸Ñ\86иÑ\82е. (Ð\9cожеÑ\82е Ð´Ð° Ñ\81поÑ\98Ñ\83ваÑ\82е Ð¿Ð°Ñ\82иÑ\88Ñ\82а Ñ\81о Control, Ð¸Ð»Ð¸ ÐºÐ¾Ð¿Ñ\87еÑ\82о Ñ\81о Ñ\98аболко Ð½Ð° Ð\9cекинÑ\82оÑ\88, Ð½Ð¾ Ð½Ðµ Ñ\81поÑ\98Ñ\83ваÑ\98Ñ\82е Ð´Ð²Ð° Ð¿Ð°Ñ\82а Ñ\81о Ñ\80азлиÑ\87ни Ð¸Ð¼Ð¸Ñ\9aа Ð¸Ð»Ð¸ Ñ\82ипови.)\n\n<img src=\"tidy\">Ð\9aÑ\80Ñ\83жниÑ\82е Ñ\82екови Ñ\81е Ð¼Ð½Ð¾Ð³Ñ\83 Ñ\82еÑ\88ки Ð·Ð° Ñ\86Ñ\80Ñ\82аÑ\9aе. Ð\9dо Ð·Ð° Ñ\82оа Ð¿Ð¾Ð¼Ð°Ð³Ð° Ñ\81амиоÑ\82 Potlatch. Ð\9dаÑ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ð³Ð¾ ÐºÑ\80Ñ\83гоÑ\82 Ð³Ñ\80Ñ\83бо, Ñ\81амо Ð²Ð½Ð¸Ð¼Ð°Ð²Ð°Ñ\98Ñ\82е Ð´Ð° Ð³Ð¸ Ñ\81поиÑ\82е ÐºÑ\80аевиÑ\82е (Ñ\82.е. Ð´Ð° Ð±Ð¸Ð´Ðµ ÐºÑ\80Ñ\83г), Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eподÑ\80едиâ\80\9c. (Ð\9eва Ñ\81е ÐºÐ¾Ñ\80иÑ\81Ñ\82и Ð¸ Ð·Ð° Ð¸Ñ\81пÑ\80аваÑ\9aе Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82а.)</bodyText>\n<headline>ТоÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI)</headline>\n<bodyText>Ð\9fÑ\80воÑ\82о Ð½ÐµÑ\88Ñ\82о Ñ\88Ñ\82о Ð³Ð¾ Ð½Ð°Ñ\83Ñ\87ивÑ\82е Ðµ ÐºÐ°ÐºÐ¾ Ð´Ð° Ð²Ð»ÐµÑ\87еÑ\82е Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\82е Ñ\82оÑ\87ка Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81. Ð\9cожеÑ\82е Ð¸ Ñ\81амиÑ\82е Ð´Ð° Ð¿Ñ\80авиÑ\82е Ð²Ð°ÐºÐ²Ð¸ Ñ\82оÑ\87ки Ñ\81о Ð´Ð²Ð¾Ñ\98но ÐºÐ»Ð¸ÐºÐ½Ñ\83ваÑ\9aе Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а: Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98ави Ð·ÐµÐ»ÐµÐ½Ð¾ ÐºÑ\80Ñ\83гÑ\87е. Ð\9dо ÐºÐ°ÐºÐ¾ Ñ\9cе Ð·Ð½Ð°ÐµÐ¼Ðµ Ð´Ð°Ð»Ð¸ Ñ\81е Ñ\80абоÑ\82и Ð·Ð° Ñ\80еÑ\81Ñ\82оÑ\80ан, Ñ\86Ñ\80ква Ð¸Ð»Ð¸ Ð½ÐµÑ\88Ñ\82о Ð´Ñ\80Ñ\83го? Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\9eзнаÑ\87Ñ\83ваÑ\9aеâ\80\9c Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е!\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 4: Ð\9eзнаÑ\87Ñ\83ваÑ\9aе\n\n--><page/><headline>Ð\9aоÑ\98 Ð²Ð¸Ð´ Ð½Ð° Ð¿Ð°Ñ\82 Ðµ Ñ\82оа?</headline>\n<bodyText>ШÑ\82ом Ñ\9cе Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82, Ñ\82Ñ\80еба Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ\87иÑ\82е Ñ\88Ñ\82о Ðµ. Ð\94али Ðµ Ð³Ð»Ð°Ð²Ð½Ð° Ð¼Ð°Ð³Ð¸Ñ\81Ñ\82Ñ\80ала, Ð¿ÐµÑ\88аÑ\87ка Ð¿Ð°Ñ\82ека Ð¸Ð»Ð¸ Ñ\80ека? Ð\9aако Ñ\81е Ð²Ð¸ÐºÐ°? Ð\98ма Ð»Ð¸ Ð½ÐµÐºÐ¾Ð¸ Ð¿Ð¾Ñ\81ебни Ð¿Ñ\80авила (на Ð¿Ñ\80. â\80\9eзабÑ\80анеÑ\82о Ð²ÐµÐ»Ð¾Ñ\81ипедиâ\80\9c)?\n\nÐ\92о OpenStreetMap Ð¾Ð²Ð° Ð³Ð¾ Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ваÑ\82е Ñ\81о â\80\9eознакиâ\80\9c. Ð\9eзнакаÑ\82а Ð¸Ð¼Ð° Ð´Ð²Ð° Ð´ÐµÐ»Ð°, Ð¸ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82иÑ\82е ÐºÐ¾Ð»ÐºÑ\83 Ñ\88Ñ\82о Ñ\81акаÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸. Ð\9dа Ð¿Ñ\80имеÑ\80, Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е i>highway | trunk</i> Ð·Ð° Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ\87иÑ\82е Ð´ÐµÐºÐ° Ð¾Ð²Ð° Ðµ Ð³Ð»Ð°Ð²ÐµÐ½ Ð¼Ð°Ð³Ð¸Ñ\81Ñ\82Ñ\80ален Ð¿Ð°Ñ\82; <i>highway | residential</i> Ð·Ð° Ð¿Ð°Ñ\82 Ð²Ð¾ Ð½Ð°Ñ\81елба; or <i>highway | footway</i> Ð·Ð° Ð¿ÐµÑ\88аÑ\87ка Ð¿Ð°Ñ\82ека. If bikes were banned, you could then add <i>bicycle | no</i>. Ð\9fоÑ\82оа, Ð·Ð° Ð´Ð° Ð³Ð¾ Ð·Ð°Ð¿Ð¸Ñ\88еÑ\82е Ð¸Ð¼ÐµÑ\82о, Ð´Ð¾Ð´Ð°Ñ\98Ñ\82е <i>name | Ð\9fаÑ\80Ñ\82изанÑ\81ки Ð\9eдÑ\80еди</i>.\n\nÐ\9eзнакиÑ\82е Ð½Ð° Potlatch Ñ\81е Ð¿Ð¾Ñ\98авÑ\83вааÑ\82 Ð½Ð°Ñ\98долÑ\83 Ð½Ð° ÐµÐºÑ\80аноÑ\82 - ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¿Ð¾Ñ\81Ñ\82оеÑ\87ка Ñ\83лиÑ\86а, Ð¸ Ñ\9cе Ð²Ð¸Ð´Ð¸Ñ\82е ÐºÐ°ÐºÐ²Ð° Ð¾Ð·Ð½Ð°ÐºÐ° Ð¸Ð¼Ð°. Ð\9aликеÑ\82е Ð½Ð° Ð·Ð½Ð°ÐºÐ¾Ñ\82 â\80\9e\80\9c (наÑ\98долÑ\83-деÑ\81но) Ð·Ð° Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е Ð½Ð¾Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÐ°. Ð¡ÐµÐºÐ¾Ñ\98а Ð¾Ð·Ð½Ð°ÐºÐ° Ð¸Ð¼Ð° â\80\9e\80\9c Ñ\81о Ñ\88Ñ\82о Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\98а Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е.\n\nÐ\9cожеÑ\82е Ð´Ð° Ð¾Ð·Ð½Ð°Ñ\87Ñ\83ваÑ\82е Ñ\86ели Ð¿Ð°Ñ\82иÑ\88Ñ\82а; Ñ\82оÑ\87ки Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82а (можеби Ð¿Ð¾Ñ\80Ñ\82а Ð¸Ð»Ð¸ Ñ\81емаÑ\84оÑ\80и); Ð¸ Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81.</bodytext>\n<column/><headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¸</headline>\n<bodyText>Ð\97а Ð´Ð° Ð²Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ðµ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ\87неÑ\82е, Potlatch Ð²Ð¸ Ð½Ñ\83ди Ð³Ð¾Ñ\82ови, Ð½Ð°Ñ\98попÑ\83лаÑ\80ни Ð¾Ð·Ð½Ð°ÐºÐ¸.\n\n<img src=\"preset_road\">Ð\9eдбеÑ\80еÑ\82е Ð³Ð¾ Ð¿Ð°Ñ\82оÑ\82, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ°Ñ\98Ñ\82е Ð½Ð¸Ð· Ñ\81имболиÑ\82е Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ð½Ð°Ñ\98деÑ\82е Ñ\81оодвеÑ\82ен. Ð\9fоÑ\82оа Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ñ\98а Ð½Ð°Ñ\98Ñ\81оодвеÑ\82наÑ\82а Ð¼Ð¾Ð¶Ð½Ð¾Ñ\81Ñ\82 Ð¾Ð´ Ð¼ÐµÐ½Ð¸Ñ\82о.\n\nСо Ð¾Ð²Ð° Ñ\81е Ð¿Ð¾Ð¿Ð¾Ð»Ð½Ñ\83вааÑ\82 Ð¾Ð·Ð½Ð°ÐºÐ¸Ñ\82е. Ð\9dекои Ñ\9cе Ð¾Ñ\81Ñ\82анаÑ\82 Ð´ÐµÐ»Ñ\83мно Ð¿Ñ\80азни Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð²Ð¿Ð¸Ñ\88еÑ\82е (на Ð¿Ñ\80имеÑ\80) Ð¸Ð¼Ðµ Ð½Ð° Ñ\83лиÑ\86аÑ\82а Ð¸ Ð±Ñ\80оÑ\98</bodyText>\n<headline>Ð\95днонаÑ\81оÑ\87ни Ð¿Ð°Ñ\82иÑ\88Ñ\82а</headline>\n<bodyText>Ð\92и Ð¿Ñ\80епоÑ\80аÑ\87Ñ\83ваме Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ° Ð·Ð° ÐµÐ´Ð½Ð¾Ð½Ð°Ñ\81оÑ\87ни Ñ\83лиÑ\86и ÐºÐ°ÐºÐ¾ <i>oneway | yes</i> - Ð½Ð¾ ÐºÐ°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ð·Ð½Ð°ÐµÑ\82е Ð²Ð¾ ÐºÐ¾Ñ\98а Ð½Ð°Ñ\81ока? Ð\9dаÑ\98долÑ\83-лево Ð¸Ð¼Ð° Ñ\81Ñ\82Ñ\80елка ÐºÐ¾Ñ\98а Ð³Ð¾ Ð¾Ð·Ð½Ð°Ñ\87Ñ\83ва Ð¿Ñ\80авеÑ\86оÑ\82 Ð½Ð°Ð¿Ð°Ñ\82оÑ\82, Ð¾Ð´ Ð¿Ð¾Ñ\87еÑ\82ок Ð´Ð¾ ÐºÑ\80аÑ\98. Ð\9aликнеÑ\82е Ð½Ð° Ð½ÐµÐ° Ð·Ð° Ð´Ð° Ñ\98а Ñ\81вÑ\80Ñ\82иÑ\82е Ð¾Ð±Ñ\80аÑ\82но.</bodyText>\n<column/><headline>Ð\98збоÑ\80 Ð½Ð° Ð²Ð°Ñ\88и Ñ\81опÑ\81Ñ\82вени Ð¾Ð·Ð½Ð°ÐºÐ¸</headline>\n<bodyText>Секако, Ð½Ðµ Ñ\81Ñ\82е Ð¾Ð³Ñ\80аниÑ\87ени Ñ\81амо Ð½Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸. Ð\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ð³Ð¾ ÐºÐ¾Ð¿Ñ\87еÑ\82о â\80\9e\80\9c  Ð·Ð° Ð´Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82иÑ\82е ÐºÐ°ÐºÐ²Ð¸ Ñ\88Ñ\82о Ñ\81акаÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸.\n\nÐ\9cожеÑ\82е Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ\82е ÐºÐ°ÐºÐ²Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¸ ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ð´Ñ\80Ñ\83гиÑ\82е Ð½Ð° <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, Ð° Ð¸Ð¼Ð°Ð¼Ðµ Ð¸ Ð´Ð¾Ð»Ð³ Ñ\81пиÑ\81ок Ð½Ð° Ð¿Ð¾Ð¿Ñ\83лаÑ\80ни Ð¾Ð·Ð½Ð°ÐºÐ¸ Ð½Ð° Ð½Ð°Ñ\88еÑ\82о Ð²Ð¸ÐºÐ¸ Ð½Ð°Ñ\80еÑ\87ена<a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Ð\95леменÑ\82и</a>. Ð\9dо Ñ\82ие Ñ\81е <i>Ñ\81амо Ð¿Ñ\80едлози, Ð° Ð½Ðµ Ð¿Ñ\80авила</i>. Ð\9dаÑ\98Ñ\81лободно Ð¸Ð·Ð¼Ð¸Ñ\81лÑ\83ваÑ\98Ñ\82е Ñ\81и Ñ\81вои Ð¾Ð·Ð½Ð°ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿Ñ\80еземаÑ\98Ñ\82е Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ¾Ñ\80иÑ\81ниÑ\86и.\n\nÐ\91идеÑ\98Ñ\9cи Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86иÑ\82е Ð¾Ð´ OpenStreetMap Ñ\81е ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ð·Ð° Ð¸Ð·Ñ\80абоÑ\82Ñ\83ваÑ\9aе Ð½Ð° Ñ\80азлиÑ\87ни ÐºÐ°Ñ\80Ñ\82и, Ñ\81екоÑ\98а ÐºÐ°Ñ\80Ñ\82а Ð¿Ñ\80икажÑ\83ва Ñ\81воÑ\98 Ð¸Ð·Ð±Ð¾Ñ\80 Ð¾Ð´ Ð¾Ð·Ð½Ð°ÐºÐ¸.</bodyText>\n<headline>РелаÑ\86ии</headline>\n<bodyText>Ð\9fонекогаÑ\88 Ð½Ðµ Ñ\81е Ð´Ð¾Ð²Ð¾Ð»Ð½Ð¸ Ñ\81амо Ð¾Ð·Ð½Ð°ÐºÐ¸, Ð¿Ð° Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° â\80\9eгÑ\80Ñ\83пиÑ\80аÑ\82еâ\80\9c Ð´Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ\9cе Ð¿Ð°Ñ\82а. Ð\9cожеби Ð²Ñ\80Ñ\82еÑ\9aеÑ\82о Ð¾Ð´ ÐµÐ´Ð½Ð° Ñ\83лиÑ\86а Ð²Ð¾ Ð´Ñ\80Ñ\83га Ðµ Ð·Ð°Ð±Ñ\80анеÑ\82о, Ð¸Ð»Ð¸ Ð¿Ð°Ðº 20 Ð¿Ð°Ñ\82еки Ð·Ð°ÐµÐ´Ð½Ð¾ Ñ\81оÑ\87иннÑ\83вааÑ\82 Ð¾Ð·Ð½Ð°Ñ\87ена Ð²ÐµÐ»Ð¾Ñ\81ипедÑ\81ка Ð¿Ð°Ñ\82ека. Ð\9eва Ñ\81е Ð¿Ñ\80ави Ð²Ð¾ Ð½Ð°Ð¿Ñ\80едноÑ\82о Ð¼ÐµÐ½Ð¸ â\80\9eÑ\80елаÑ\86ииâ\80\9c. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Ð\94ознаÑ\98Ñ\82е Ð¿Ð¾Ð²ÐµÑ\9cе</a> Ð½Ð° Ð²Ð¸ÐºÐ¸Ñ\82о.</bodyText>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 6: Ð\9eÑ\82Ñ\81Ñ\82Ñ\80анÑ\83ваÑ\9aе Ð½ÐµÐ¸Ñ\81пÑ\80авноÑ\81Ñ\82и\n\n--><page/><headline>Ð\92Ñ\80аÑ\9cаÑ\9aе Ð³Ñ\80еÑ\88ки</headline>\n<bodyText><img src=\"undo\">Ð\9eва Ðµ ÐºÐ¾Ð¿Ñ\87еÑ\82о Ð·Ð° Ð²Ñ\80аÑ\9cаÑ\9aе (може Ð¸ Ñ\81о Ñ\81Ñ\82иÑ\81каÑ\9aе Ð½Ð° Z) - Ð¾Ð²Ð° Ñ\9cе Ð³Ð¾ Ð²Ñ\80аÑ\82и Ð¿Ð¾Ñ\81ледноÑ\82о Ð½ÐµÑ\88Ñ\82о ÐºÐ¾Ðµ Ñ\81Ñ\82е Ð³Ð¾ Ð½Ð°Ð¿Ñ\80авиле.\n\nÐ\9cожеÑ\82е Ð´Ð° â\80\9eвÑ\80аÑ\82иÑ\82еâ\80\9c Ð¿Ñ\80еÑ\82Ñ\85одно Ð·Ð°Ñ\87Ñ\83вана Ð²ÐµÑ\80зиÑ\98а Ð½Ð° ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82 Ð¸Ð»Ð¸ Ñ\82оÑ\87ка. Ð\9eдбеÑ\80еÑ\82е Ñ\98а, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½ÐµÑ\98зиниоÑ\82 Ð¸Ð´. Ð±Ñ\80. (бÑ\80оÑ\98оÑ\82 Ð½Ð°Ñ\98долÑ\83-лево) - Ð¸Ð»Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Ð½Ð° H (за â\80\9eиÑ\81Ñ\82оÑ\80иÑ\98аâ\80\9c). Ð\8cе Ð²Ð¸Ð´Ð¸Ñ\82е Ñ\81пиÑ\81ок Ð½Ð° ÐºÐ¾Ñ\98а Ñ\81е Ð½Ð°Ð²ÐµÐ´Ñ\83ва ÐºÐ¾Ñ\98 Ñ\98а Ñ\83Ñ\80едÑ\83вал Ð¸ ÐºÐ¾Ð³Ð°. Ð\9eдбеÑ\80еÑ\82е Ñ\98а Ñ\81аканаÑ\82а Ð²ÐµÑ\80зиÑ\98а, Ð¸ Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eÐ\92Ñ\80аÑ\82иâ\80\9c.\n\nÐ\94околкÑ\83 Ñ\81Ñ\82е Ð¸Ð·Ð±Ñ\80иÑ\88але Ð¿Ð°Ñ\82 Ð¿Ð¾ Ð³Ñ\80еÑ\88ка Ð¸ Ñ\81Ñ\82е Ð·Ð°Ñ\87Ñ\83вале, Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е U (за Ð´Ð° Ð²Ñ\80аÑ\82иÑ\82е). Ð\8cе Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ñ\81иÑ\82е Ð¸Ð·Ð±Ñ\80иÑ\88ани Ð¿Ð°Ñ\82иÑ\88Ñ\82а. Ð\9eдбеÑ\80еÑ\82е Ð³Ð¾ Ñ\81аканиоÑ\82 Ð¿Ð°Ñ\82; Ð¾Ñ\82клÑ\83Ñ\87еÑ\82е Ð³Ð¾ Ñ\81о ÐºÐ»Ð¸ÐºÐ½Ñ\83ваÑ\9aе Ð½Ð° ÐºÐ°Ñ\82анÑ\87еÑ\82о; Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\98Ñ\82е.\n\nÐ\9cиÑ\81лиÑ\82е Ð´ÐµÐºÐ° Ð½ÐµÐºÐ¾Ñ\98 Ð´Ñ\80Ñ\83г ÐºÐ¾Ñ\80иÑ\81ник Ð½Ð°Ð¿Ñ\80авил Ð³Ñ\80еÑ\88ка? Ð\98Ñ\81пÑ\80аÑ\82еÑ\82е Ð¼Ñ\83 Ð¿Ñ\80иÑ\98аÑ\82елÑ\81ка Ð¿Ð¾Ñ\80ака. Ð\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ñ\98а Ð¸Ñ\81Ñ\82оÑ\80иÑ\98аÑ\82а (H) Ð·Ð° Ð´Ð° Ð¼Ñ\83 Ð³Ð¾ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð¸Ð¼ÐµÑ\82о, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÐ\9fоÑ\88Ñ\82аâ\80\9c\n\nÐ\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ð³Ð¾ Ð\98нÑ\81пекÑ\82оÑ\80оÑ\82 (во Ð¼ÐµÐ½Ð¸Ñ\82о â\80\9eÐ\9dапÑ\80едноâ\80\9c) Ð·Ð° ÐºÐ¾Ñ\80иÑ\81ни Ð¸Ð½Ñ\84оÑ\80маÑ\86ии Ð·Ð° Ð¼Ð¾Ð¼ÐµÐ½Ñ\82алниоÑ\82 Ð¿Ð°Ñ\82 Ð¸Ð»Ð¸ Ñ\82оÑ\87ка.\n</bodyText><column/><headline>ЧÐ\9fÐ\9f</headline>\n<bodyText><b>Ð\9aако Ð´Ð° Ð³Ð¸ Ð²Ð¸Ð´Ð°Ð¼ Ð¼Ð¾Ð¸Ñ\82е Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки?</b>\nÐ\9fаÑ\82ниÑ\82е Ñ\82оÑ\87ки Ñ\81е Ð¿Ð¾Ñ\98авÑ\83вааÑ\82 Ñ\81амо Ð°ÐºÐ¾ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÑ\83Ñ\80едиâ\80\9c Ð´Ð¾ Ð¸Ð¼ÐµÑ\82о Ð½Ð° Ñ\82Ñ\80агаÑ\82а Ð²Ð¾ â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c. Ð\9fодаÑ\82оÑ\82екаÑ\82а Ð¼Ð¾Ñ\80а Ð´Ð° Ð¸Ð¼Ð° Ð¸ Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки Ð¸ Ð·Ð°Ð¿Ð¸Ñ\81 Ð½Ð° Ñ\82Ñ\80агаÑ\82а - Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82 Ð½Ðµ Ð¿Ñ\80опÑ\83Ñ\88Ñ\82а Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82еки ÐºÐ¾Ð¸ Ð¸Ð¼Ð°Ð°Ñ\82 Ñ\81амо Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки.\n\nÐ\9fовеÑ\9cе Ð§Ð\9fÐ\9f Ð·Ð° <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> Ð¸ <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Ð\9fобÑ\80зо Ñ\80абоÑ\82еÑ\9aе</headline>\n<bodyText>ШÑ\82о Ð¿Ð¾Ð²ÐµÑ\9cе Ð¾Ð´Ð´Ð°Ð»ÐµÑ\87Ñ\83ваÑ\82е, Ñ\82оа Ð¿Ð¾Ð²ÐµÑ\9cе Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и Ð¼Ð¾Ñ\80а Ð´Ð° Ð²Ñ\87иÑ\82а Potlatch. Ð\9fÑ\80иближеÑ\82е Ð¿Ñ\80ед Ð´Ð° Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eУÑ\80едиâ\80\9c\n\nÐ\98Ñ\81клÑ\83Ñ\87еÑ\82е Ð³Ð¾ â\80\9eÐ\9aоÑ\80иÑ\81Ñ\82и ÐºÑ\83Ñ\80Ñ\81оÑ\80и â\80\9eмоливâ\80\9c Ð¸ â\80\9eÑ\80акаâ\80\9câ\80\9c (во Ð¿Ñ\80озоÑ\80еÑ\86оÑ\82 Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aе) Ð·Ð° Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ\82е Ð¼Ð°ÐºÑ\81имална Ð±Ñ\80зина.\n\nÐ\90ко Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82 Ñ\80абоÑ\82и Ð±Ð°Ð²Ð½Ð¾, Ð²Ñ\80аÑ\82еÑ\82е Ñ\81е Ð¿Ð¾Ð´Ð¾Ñ\86на. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Ð\9fÑ\80овеÑ\80еÑ\82е Ð³Ð¾ Ð²Ð¸ÐºÐ¸Ñ\82о</a> Ð·Ð° Ð´Ð° Ð¿Ñ\80овеÑ\80иÑ\82е Ð¿Ð¾Ð·Ð½Ð°Ñ\82и Ð¿Ñ\80облеми. Ð\9dекои Ñ\82еÑ\80мини ÐºÐ°ÐºÐ¾ Ð½ÐµÐ´ÐµÐ»Ð° Ð½Ð°Ð²ÐµÑ\87еÑ\80 Ñ\81е Ñ\81екогаÑ\88 Ð¾Ð¿Ñ\82оваÑ\80ени.\n\nÐ\9aажеÑ\82е Ð¼Ñ\83 Ð½Ð° Potlatch Ð´Ð° Ð³Ð¸ Ð·Ð°Ð¿Ð°Ð¼Ñ\82и вашите омилени комплети со ознаки. Одберете пат или точка со тие ознаки, па притиснете на Ctrl, Shift и на број од 1 до 9. Потоа за повторно да ги користите тие ознаки, само притиснете  Shift и тој број. (Ќе се паметат секојпат кога го користите Potlatch на овој сметач.)\n\nПретворете ја вашата GPS трага во пат со тоа што ќе ја пронајдете на списокот „GPS траги“ и ќе кликнете на „уреди“ до неа, а потоа на кутивчето „претвори“. Трагата ќе се заклучи (црвено), затоа не зачувувајте. Најпрвин уредете ја, па кликнете на катанчето (најдолу-десно) за да ја отклучите кога сте спремни да ја зачувате.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 7: Брза помош\n\n--><page/><headline>Што да кликате</headline>\n<bodyText><b>Влечете ја картата</b> за да се движите наоколу.\n<b>Двоен клик</b> за  да направите нова точка од интерес (POI).\n<b>Кликнете еднап</b> за да започнете нов пат.\n<b>Држете и влечете пат или точка од интерес (POI)</b> за да ги поместите.</bodyText>\n<headline>Кога цртате пат</headline>\n<bodyText><b>Двоен клик</b> или <b>Enter</b> за да завршите со цртање.\n<b>Кликнете</b> на друг пат за да направите крстосница.\n<b>Shift-клик на крајот на друг пат</b> за да споите.</bodyText>\n<headline>Кога ќе изберете пат</headline>\n<bodyText><b>Кликнете на точката</b> за да ја одберете.\n<b>Shift-клик на патот</b> за да вметнете нова точка.\n<b>Shift-клик на точка</b> за оттаму да започнете нов пат.\n<b>Ctrl-клик на друг пат</b> за спојување.</bodyText>\n</bodyText>\n<column/><headline>Тастатурни кратенки</headline>\n<bodyText><textformat tabstops='[25]'>B Додај позадинска изворна ознака\nC Затвори измени\nG Прикажи GPS траги\nH Прикажи историја\nI Прикажи инспектор\nJ сврзи точка за вкрстени патишта\n(+Shift) Unjoin from other ways\nK Заклучи/отклучи го моментално избраното\nL Прикажи моментална географска должина\nM Зголеми уредувачки прозорец\nP Создај паралелен пат\nR Повтори ги ознаките\nS Зачувај (освен ако не е во живо)\nT Подреди во права линија/круг\nU Врати избришано (прикажи избришани патишра)\nX Пресечи пат на две\nZ Врати\n- Отстрани точка само од овој пат\n+ Додај нова ознака\n/ Избор на друг пат со истава точка\n</textformat><textformat tabstops='[50]'>Delete Избриши точка\n  (+Shift) Избриши цел пат\nEnter Заврши со цртање на линијата\nSpace Држи и влечи позадина\nEsc Откажи го ова уредување; превчитај од опслужувачот \n0 Отстрани ги сите ознаки\n1-9 Избор на зададени ознаки\n  (+Shift) Избери запамтени ознаки\n  (+S/Ctrl) Запамти ознаки\n§ или ` Кружи помеѓу групи ознаки\n</textformat>\n</bodyText>"
+  help_html: "<!--\n\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 1: Ð\92овед\n\n--><headline>Ð\94обÑ\80едоÑ\98довÑ\82е Ð²Ð¾ Potlatch</headline>\n<largeText>Potlatch Ðµ Ñ\83Ñ\80едник Ð½Ð° OpenStreetMap ÐºÐ¾Ñ\98 Ðµ Ð»ÐµÑ\81ен Ð·Ð° Ñ\83поÑ\82Ñ\80еба. Ð¦Ñ\80Ñ\82аÑ\98Ñ\82е Ð¿Ð°Ñ\82иÑ\88Ñ\82а, Ð·Ð½Ð°Ð¼ÐµÐ½Ð¸Ñ\82оÑ\81Ñ\82и, Ñ\81помениÑ\86и Ð¸ Ð¿Ñ\80одавниÑ\86и Ð¾Ð´ Ð²Ð°Ñ\88иÑ\82е GPS Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и, Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики Ð¸Ð»Ð¸ Ñ\81Ñ\82аÑ\80и ÐºÐ°Ñ\80Ñ\82и.\n\nÐ\9eвие Ñ\81Ñ\82Ñ\80аниÑ\86и Ð·Ð° Ð¿Ð¾Ð¼Ð¾Ñ\88 Ñ\9cе Ð²Ðµ Ð·Ð°Ð¿Ð¾Ð·Ð½Ð°Ð°Ñ\82 Ñ\81о Ð¾Ñ\81новиÑ\82е Ð½Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Potlatch, Ð¸ Ñ\9cе Ð²Ð¸ Ð¿Ð¾ÐºÐ°Ð¶Ð°Ñ\82 ÐºÐ°Ð´Ðµ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е Ð¿Ð¾Ð²ÐµÑ\9cе. Ð\9aликнеÑ\82е Ð½Ð° Ð½Ð°Ñ\81ловиÑ\82е Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е.\n\nÐ\97а Ð´Ð° Ð¸Ð·Ð»ÐµÐ·ÐµÑ\82е, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð±Ð¸Ð»Ð¾ ÐºÐ°Ð´Ðµ Ð²Ð¾Ð½ Ð¿Ñ\80озоÑ\80еÑ\86ов.\n\n</largeText>\n\n<column/><headline>Ð\9aоÑ\80иÑ\81но Ð´Ð° Ñ\81е Ð·Ð½Ð°Ðµ</headline>\n<bodyText>Ð\9dе ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\98Ñ\82е Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и!\n\nÐ\90ко Ð¸Ð·Ð±ÐµÑ\80еÑ\82е â\80\9eУÑ\80едÑ\83ваÑ\9aе Ð²Ð¾ Ð¶Ð¸Ð²Ð¾â\80\9c, Ñ\81иÑ\82е Ð¿Ñ\80омени ÐºÐ¾Ð¸ Ñ\9cе Ð³Ð¸ Ð½Ð°Ð¿Ñ\80авиÑ\82е Ð¾Ð´Ð°Ñ\82 Ð½Ð° Ð±Ð°Ð·Ð°Ñ\82а Ð´Ð¾Ð´ÐµÐºÐ° Ð³Ð¸ Ñ\86Ñ\80Ñ\82аÑ\82е - Ñ\82.е. <i>веднаÑ\88</i>. Ð\90ко Ð½Ðµ Ñ\81Ñ\82е Ñ\82олкÑ\83 Ñ\81игÑ\83Ñ\80ни Ð²Ð¾ Ð¿Ñ\80омениÑ\82е, Ð¾Ð´Ð±ÐµÑ\80еÑ\82е â\80\9eУÑ\80едÑ\83ваÑ\9aе Ñ\81о Ð·Ð°Ñ\87Ñ\83вÑ\83ваÑ\9aеâ\80\9c, Ð¸ Ñ\82ака Ð¿Ñ\80омениÑ\82е Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ð´Ñ\83Ñ\80и ÐºÐ¾Ð³Ð° Ñ\9cе Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c.\n\nСиÑ\82е Ð½Ð°Ð¿Ñ\80авени Ñ\83Ñ\80едÑ\83ваÑ\9aа Ñ\9cе Ñ\81е Ð¿Ð¾ÐºÐ°Ð¶Ð°Ñ\82 Ð¿Ð¾ Ñ\87аÑ\81-два (на Ð½ÐµÐºÐ¾Ð»ÐºÑ\83 Ð¿Ð¾Ñ\81ложени Ñ\80абоÑ\82и Ð¸Ð¼ Ñ\82Ñ\80еба ÐµÐ´Ð½Ð° Ð½ÐµÐ´ÐµÐ»Ð°). Ð\9dа ÐºÐ°Ñ\80Ñ\82аÑ\82а Ð½Ðµ Ðµ Ð¿Ñ\80икажано Ñ\81è - Ñ\82оа Ð±Ð¸ Ð±Ð¸Ð» Ð³Ð¾Ð»ÐµÐ¼ Ð½ÐµÑ\80ед. Ð\91идеÑ\98Ñ\9cи Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86иÑ\82е Ð½Ð° OpenStreetMap Ñ\81е Ð¾Ñ\82воÑ\80ен Ð¸Ð·Ð²Ð¾Ñ\80, Ð´Ñ\80Ñ\83гиÑ\82е ÐºÐ¾Ñ\80иÑ\81ниÑ\86и Ñ\81лободно Ð¿Ñ\80аваÑ\82 ÐºÐ°Ñ\80Ñ\82и Ð½Ð° ÐºÐ¾Ð¸ Ñ\81е Ð¿Ñ\80икажани Ñ\80азлиÑ\87ни Ð°Ñ\81пекÑ\82и - ÐºÐ°ÐºÐ¾ <a href=\"http://www.opencyclemap.org/\" target=\"_blank\">OpenCycleMap (Ð\9eÑ\82воÑ\80ена Ð²ÐµÐ»Ð¾Ñ\81ипедÑ\81ка ÐºÐ°Ñ\80Ñ\82а)</a> Ð¸Ð»Ð¸ <a href=\"http://maps.cloudmade.com/?styleId=999\" target=\"_blank\">Midnight Commander</a>.\n\nÐ\97апомнеÑ\82е Ð´ÐµÐºÐ° Ð¾Ð²Ð° Ðµ <i>и</i> Ñ\83бава ÐºÐ°Ñ\80Ñ\82а (заÑ\82оа Ñ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ñ\83бави ÐºÑ\80иви Ð»Ð¸Ð½Ð¸Ð¸ Ð·Ð° ÐºÑ\80ивиниÑ\82е), Ð½Ð¾ Ð¸ Ð´Ð¸Ñ\98агÑ\80ам (заÑ\82оа Ð¿Ñ\80овеÑ\80Ñ\83ваÑ\98Ñ\82е Ð´ÐµÐºÐ° Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а Ñ\81е Ñ\81Ñ\80еÑ\9cавааÑ\82 Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86и) .\n\nÐ\94али Ð²Ð¸ Ñ\81поменавме Ð´ÐµÐºÐ° Ð½Ðµ Ñ\81мее Ð´Ð° Ñ\81е ÐºÐ¾Ð¿Ð¸Ñ\80а Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и?\n</bodyText>\n\n<column/><headline>Ð\94ознаÑ\98Ñ\82е Ð¿Ð¾Ð²ÐµÑ\9cе</headline>\n<bodyText><a href=\"http://wiki.openstreetmap.org/wiki/Potlatch\" target=\"_blank\">Potlatch Ð¿Ñ\80иÑ\80аÑ\87ник</a>\n<a href=\"http://lists.openstreetmap.org/\" target=\"_blank\">Ð\9fоÑ\88Ñ\82енÑ\81ки Ñ\81пиÑ\81оÑ\86и</a>\n<a href=\"http://irc.openstreetmap.org/\" target=\"_blank\">РазговоÑ\80и (помоÑ\88 Ð²Ð¾ Ð¶Ð¸Ð²Ð¾)</a>\n<a href=\"http://forum.openstreetmap.org/\" target=\"_blank\">ФоÑ\80Ñ\83м</a>\n<a href=\"http://wiki.openstreetmap.org/\" target=\"_blank\">Ð\92ики Ð½Ð° Ð·Ð°ÐµÐ´Ð½Ð¸Ñ\86аÑ\82а</a>\n<a href=\"http://trac.openstreetmap.org/browser/applications/editors/potlatch\" target=\"_blank\">Ð\98звоÑ\80ен ÐºÐ¾Ð´ Ð½Ð° Potlatch</a>\n</bodyText>\n<!-- News etc. goes here -->\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 2: ÐºÐ°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е\n\n--><page/><headline>Ð\9aако Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е</headline>\n<bodyText>Сега Potlatch Ð²Ð¸ Ðµ Ð¾Ñ\82воÑ\80ен. Ð\9aликнеÑ\82е Ð½Ð° â\80\9eУÑ\80еди Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\98â\80\9c Ð·Ð° Ð´Ð° Ð¿Ð¾Ñ\87неÑ\82е\n\nÐ\97наÑ\87и Ñ\81пÑ\80емни Ñ\81Ñ\82е Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е ÐºÐ°Ñ\80Ñ\82а. Ð\9dаÑ\98леÑ\81но Ðµ Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\87не Ñ\81о Ð¿Ð¾Ñ\81Ñ\82авеÑ\9aе Ð½Ð° Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а (POI). Ð\9eвие Ð¼Ð¾Ð¶Ð°Ñ\82 Ð´Ð° Ð±Ð¸Ð´Ð°Ñ\82 Ñ\80еÑ\81Ñ\82оÑ\80ани, Ñ\86Ñ\80кви, Ð¶ÐµÐ»ÐµÐ·Ð½Ð¸Ñ\87ки Ñ\81Ñ\82аниÑ\86и...Ñ\81è Ñ\88Ñ\82о Ñ\81акаÑ\82е.</bodytext>\n\n<column/><headline>Ð\92леÑ\87еÑ\9aе Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\9aе</headline>\n<bodyText>Ð\97а Ð´Ð° Ð²Ð¸ Ð¾Ð»ÐµÑ\81ниме, Ð³Ð¸ Ð¿Ð¾Ñ\81Ñ\82авивме Ð½Ð°Ñ\98Ñ\87еÑ\81Ñ\82иÑ\82е Ð²Ð¸Ð´Ð¾Ð²Ð¸ Ð½Ð° Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI), Ð½Ð° Ð´Ð½Ð¾Ñ\82о Ð¾Ð´ ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9dа ÐºÐ°Ñ\80Ñ\82аÑ\82а Ñ\81е Ñ\81Ñ\82авааÑ\82 Ñ\81о Ð½Ð¸Ð²Ð½Ð¾ Ð¿Ð¾Ð²Ð»ÐµÐºÑ\83ваÑ\9aе Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\9aе Ð½Ð° Ñ\81аканоÑ\82о Ð¼ÐµÑ\81Ñ\82о. Ð\98 Ð½Ðµ Ð³Ñ\80ижеÑ\82е Ñ\81е Ð°ÐºÐ¾ Ð½Ðµ Ñ\81Ñ\82е Ð³Ð¾ Ð¿Ð¾Ð³Ð¾Ð´Ð¸Ð»Ðµ Ð¼ÐµÑ\81Ñ\82оÑ\82о Ð¾Ð´ Ð¿Ñ\80в Ð¿Ð°Ñ\82: Ð¼Ð¾Ð¶ÐµÑ\82е Ñ\82оÑ\87киÑ\82е Ð´Ð° Ð¿Ð¾Ð²Ð»ÐµÐºÑ\83ваÑ\82е Ð¿Ð¾Ð²Ñ\82оÑ\80но, Ñ\81è Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ñ\98а Ð½Ð°Ð¼ÐµÑ\81Ñ\82иÑ\82е Ñ\81екоÑ\98а Ñ\82оÑ\87ка ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е.\n\nÐ\9aога Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови Ñ\81о Ñ\82оа, Ñ\81Ñ\82авеÑ\82е Ð¼Ñ\83 Ð¸Ð¼Ðµ Ð½Ð° Ñ\80еÑ\81Ñ\82оÑ\80аноÑ\82 (или Ñ\86Ñ\80кваÑ\82а, Ñ\81Ñ\82аниÑ\86аÑ\82а Ð¸Ñ\82н.) Ð\9dа Ð´Ð½Ð¾Ñ\82о Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98ави Ð¼Ð°Ð»Ð° Ñ\82абела. Ð\95дна Ð¾Ð´ Ñ\81Ñ\82авкиÑ\82е Ñ\9cе Ð±Ð¸Ð´Ðµ â\80\9eимеâ\80\9c, Ð¸ Ð´Ð¾ Ð½ÐµÐ³Ð¾ â\80\9e\82Ñ\83ка Ð²Ð½ÐµÑ\81еÑ\82е Ð¸Ð¼Ðµ)â\80\9c. Ð\9aликнеÑ\82е Ð½Ð° Ñ\82оÑ\98 Ñ\82екÑ\81Ñ\82 Ð¸ Ð²Ð¿Ð¸Ñ\88еÑ\82е Ð³Ð¾ Ð¸Ð¼ÐµÑ\82о.\n\nÐ\9aликнеÑ\82е Ð´Ñ\80Ñ\83где Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð²Ð°Ñ\88аÑ\82а Ñ\82оÑ\87ка Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI), Ð¸ Ñ\82ака Ñ\9cе Ñ\81е Ð²Ñ\80аÑ\82и Ð¼Ð°Ð»Ð¸Ð¾Ñ\82 Ñ\88аÑ\80ен Ð¿Ñ\80авоаголник.\n\nÐ\9bеÑ\81но Ðµ, Ð½ÐµÐ»Ð¸? Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c (наÑ\98долÑ\83-деÑ\81но) ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови.\n</bodyText><column/><headline>Ð\94вижеÑ\9aе Ð¿Ð¾ ÐºÐ°Ñ\80Ñ\82аÑ\82а</headline>\n<bodyText>Ð\97а Ð´Ð° Ð¾Ñ\82идеÑ\82е Ð½Ð° Ð´Ñ\80Ñ\83г Ð´ÐµÐ» Ð¾Ð´ ÐºÐ°Ñ\80Ñ\82аÑ\82а, Ñ\81амо Ð¿Ð¾Ð²Ð»ÐµÑ\87еÑ\82е Ð¿Ñ\80азен Ð¿Ñ\80оÑ\81Ñ\82оÑ\80. Potlatch Ð°Ð²Ñ\82омаÑ\82Ñ\81ки Ñ\9cе Ð²Ñ\87иÑ\82а Ð½Ð¾Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и (гледаÑ\98Ñ\82е Ð½Ð°Ñ\98гоÑ\80е-деÑ\81но)\n\nÐ\92и Ñ\80ековме Ð´Ð° â\80\9eУÑ\80едиÑ\82е Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\82еâ\80\9c, Ð½Ð¾ Ð¼Ð¾Ð¶ÐµÑ\82е Ð¸ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eУÑ\80едÑ\83ваÑ\9aе Ð²Ð¾ Ð¶Ð¸Ð²Ð¾â\80\9c. Ð\9fод Ð¾Ð²Ð¾Ñ\98 Ñ\80ежим Ð¿Ñ\80омениÑ\82е Ð¾Ð´Ð°Ñ\82 Ð¿Ñ\80аво Ð²Ð¾ Ð±Ð°Ð·Ð°Ñ\82а, Ð¸ Ð·Ð°Ñ\82оа Ð½ÐµÐ¼Ð° ÐºÐ¾Ð¿Ñ\87е â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c. Ð\9eва Ðµ Ð´Ð¾Ð±Ñ\80о Ð·Ð° Ð±Ñ\80зи Ð¿Ñ\80омени Ð¸ <a href=\"http://wiki.openstreetmap.org/wiki/Current_events\" target=\"_blank\">каÑ\80Ñ\82огÑ\80аÑ\84Ñ\81ки Ð°ÐºÑ\86ии</a>.</bodyText>\n\n<headline>Следни Ñ\87екоÑ\80и</headline>\n<bodyText>Ð\97адоволни Ñ\81Ñ\82е Ð¾Ð´ Ð´Ð¾Ñ\81егаÑ\88ноÑ\82о? Ð\9eдлиÑ\87но. Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aеâ\80\9c Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е ÐºÐ°ÐºÐ¾ Ð´Ð° Ð±Ð¸Ð´ÐµÑ\82е <i>виÑ\81Ñ\82инÑ\81ки</i> ÐºÐ°Ñ\80Ñ\82огÑ\80аÑ\84!</bodyText>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 3: Ð\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aе\n\n--><page/><headline>Ð\98Ñ\81Ñ\82Ñ\80ажÑ\83ваÑ\9aе Ñ\81о GPS</headline>\n<bodyText>Ð\98деÑ\98аÑ\82а Ð¿Ð¾Ð·Ð°Ð´Ð¸ OpenStreetMap  Ðµ Ñ\81оздаваÑ\9aе Ð½Ð° ÐºÐ°Ñ\80Ñ\82а Ð±ÐµÐ· Ð¾Ð³Ñ\80аниÑ\87Ñ\83ваÑ\87киÑ\82е Ð°Ð²Ñ\82оÑ\80Ñ\81ки Ð¿Ñ\80ава ÐºÐ¾Ð¸ Ð³Ð¸ Ð¸Ð¼Ð°Ð°Ñ\82 Ð´Ñ\80Ñ\83ги ÐºÐ°Ñ\80Ñ\82и. Ð\9eва Ð·Ð½Ð°Ñ\87и Ð´ÐµÐºÐ° Ð¾Ð²Ð´ÐµÑ\88ниÑ\82е ÐºÐ°Ñ\80Ñ\82и Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð³Ð¸ ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\82е Ð¾Ð´ Ð½Ð¸ÐºÐ°Ð´Ðµ: Ð¼Ð¾Ñ\80аÑ\82е Ñ\81амиÑ\82е Ð´Ð° Ð³Ð¸ Ð¸Ñ\81Ñ\82Ñ\80ажиÑ\82е Ñ\83лиÑ\86иÑ\82е. Ð\97а Ñ\81Ñ\80еÑ\9cа, Ð¾Ð²Ð° Ðµ Ð¼Ð½Ð¾Ð³Ñ\83 Ð·Ð°Ð±Ð°Ð²Ð½Ð¾!\nÐ\9dаÑ\98добÑ\80о Ðµ Ð´Ð° Ñ\81е Ð·ÐµÐ¼Ðµ Ñ\80аÑ\87ен GPS-Ñ\83Ñ\80ед. Ð\9fÑ\80онаÑ\98деÑ\82е Ð½ÐµÐºÐ¾Ñ\98 Ñ\80егион ÐºÐ¾Ñ\98 Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½Ðµ Ðµ Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9fÑ\80оÑ\88еÑ\82аÑ\98Ñ\82е Ð¿Ð¾ Ñ\83лиÑ\86иÑ\82е, Ð¸Ð»Ð¸ Ð¸Ð·Ð²Ð¾Ð·ÐµÑ\82е Ð³Ð¸ Ð½Ð° Ð²ÐµÐ»Ð¾Ñ\81ипед, Ð´Ñ\80жаÑ\98Ñ\9cи Ð³Ð¾ Ñ\83Ñ\80едоÑ\82 Ð²ÐºÐ»Ñ\83Ñ\87ен. Ð\9fо Ð¿Ð°Ñ\82 Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ваÑ\98Ñ\82е Ð³Ð¸ Ð¸Ð¼Ð¸Ñ\9aаÑ\82а Ð½Ð° Ñ\83лиÑ\86иÑ\82е, Ð¸ Ñ\81еÑ\82о Ð¾Ð½Ð° Ñ\88Ñ\82о Ð²Ðµ Ð¸Ð½Ñ\82еÑ\80еÑ\81иÑ\80а (Ñ\80еÑ\81Ñ\82оÑ\80ани? Ñ\86Ñ\80кви?).\n\nÐ\9aога Ñ\9cе Ð´Ð¾Ñ\98деÑ\82е Ð´Ð¾Ð¼Ð°, Ð²Ð°Ñ\88иоÑ\82 GPS-Ñ\83Ñ\80ед Ñ\9cе Ñ\81одÑ\80жи Ñ\82.н. â\80\9eзапиÑ\81ник Ð½Ð° Ñ\82Ñ\80агиâ\80\9c (tracklog) ÐºÐ¾Ñ\98 Ð¸Ð¼Ð° ÐµÐ²Ð¸Ð´ÐµÐ½Ñ\86иÑ\98а Ð·Ð° Ñ\81екаде ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81Ñ\82е Ð±Ð¸Ð»Ðµ. Ð\9fоÑ\82оа Ð¾Ð²Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð³Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ\82е Ð½Ð° OpenStreetMap.\n\nÐ\9dаÑ\98добÑ\80иоÑ\82 Ð²Ð¸Ð´ Ð½Ð° GPS-Ñ\83Ñ\80ед Ðµ Ð¾Ð½Ð¾Ñ\98 Ñ\88Ñ\82о Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ва Ñ\87еÑ\81Ñ\82о (на Ñ\81екоÑ\98а Ñ\81екÑ\83нда-две) Ð¸ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¾ Ð¿Ð°Ð¼Ñ\82еÑ\9aе. Ð\93олем Ð´ÐµÐ» Ð¾Ð´ Ð½Ð°Ñ\88иÑ\82е ÐºÐ°Ñ\80Ñ\82огÑ\80аÑ\84и ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ñ\80аÑ\87ни Garmin Ð°Ð¿Ð°Ñ\80аÑ\82и, Ð¸Ð»Ð¸ Bluetooth-Ñ\83Ñ\80еди. Ð\9dа Ð½Ð°Ñ\88еÑ\82о Ð²Ð¸ÐºÐ¸ Ñ\9cе Ð½Ð°Ñ\98деÑ\82е Ð¿Ð¾Ð´Ñ\80обни <a href=\"http://wiki.openstreetmap.org/wiki/GPS_Reviews\" target=\"_blank\">анализа Ð½Ð° GPS-Ñ\83Ñ\80еди</a></bodyText>\n\n<column/><headline>Ð\9fодигаÑ\9aе Ð½Ð° Ð¿Ð°Ñ\82екаÑ\82а</headline>\n<bodyText>Сега Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° Ñ\98а Ð¿Ñ\80еÑ\84Ñ\80лиÑ\82е Ñ\82Ñ\80агаÑ\82а Ð¾Ð´ GPS-Ñ\83Ñ\80едоÑ\82. Ð\9cожеби Ñ\83Ñ\80едоÑ\82 Ð¸Ð¼Ð° Ñ\81воÑ\98а Ð¿Ñ\80огÑ\80амÑ\81ка Ð¾Ð¿Ñ\80ема, Ð¸Ð»Ð¸ Ð¿Ð°Ðº Ð¾Ð´ Ð½ÐµÐ³Ð¾ Ð¿Ð¾Ð¶Ðµ Ð´Ð° Ñ\81е ÐºÐ¾Ð¿Ð¸Ñ\80ааÑ\82 Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82еки Ð¿Ñ\80едкÑ\83 USB. Ð\90ко Ð½Ðµ Ð¼Ð¾Ð¶Ðµ, Ð¿Ñ\80обаÑ\98Ñ\82е Ð³Ð¾ <a href=\"http://www.gpsbabel.org/\" target=\"_blank\">GPSBabel</a>. Ð\9aако Ð¸ Ð´Ð° Ðµ, Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82екаÑ\82а Ð²Ð¾ Ñ\81екоÑ\98 Ñ\81лÑ\83Ñ\87аÑ\98 Ñ\82Ñ\80еба Ð´Ð° Ð±Ð¸Ð´Ðµ Ð²Ð¾ GPX Ñ\84оÑ\80маÑ\82.\n\nÐ\9fоÑ\82оа Ð¾Ð´ÐµÑ\82е Ð½Ð° â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c Ð¸ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ\82е Ñ\98а Ñ\82Ñ\80агаÑ\82а Ð½Ð° OpenStreetMap. Ð\9dо Ð¾Ð²Ð° Ðµ Ñ\81амо Ð¿Ñ\80виоÑ\82 Ñ\87екоÑ\80 - Ñ\82Ñ\80агаÑ\82а Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½ÐµÐ¼Ð° Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98ави Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а. Ð\9cоÑ\80аÑ\82е Ñ\81амиÑ\82е Ð´Ð° Ð³Ð¸ Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¸ Ð¸Ð¼ÐµÐ½Ñ\83ваÑ\82е Ñ\83лиÑ\86иÑ\82е, Ñ\81ледеÑ\98Ñ\9cи Ñ\98а Ñ\82Ñ\80агаÑ\82а.</bodyText>\n<headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ñ\82Ñ\80агаÑ\82а</headline>\n<bodyText>Ð\9fÑ\80онаÑ\98деÑ\82е Ñ\98а Ð²Ð°Ñ\88аÑ\82а Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ\82а Ñ\82Ñ\80ага Ð²Ð¾ Ñ\81пиÑ\81окоÑ\82 Ð½Ð° â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÑ\83Ñ\80едиâ\80\9c <i>веднаÑ\88 Ð´Ð¾ Ð½ÐµÐ°</i>. Potlatch Ñ\9cе Ð·Ð°Ð¿Ð¾Ñ\87не Ñ\81о Ð¾Ð²Ð°Ð° Ð²Ñ\87иÑ\82ана Ñ\82Ñ\80ага, Ð¿Ð»Ñ\83Ñ\81 Ð°ÐºÐ¾ Ð¸Ð¼Ð° Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки. Ð¡ÐµÐ³Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\86Ñ\80Ñ\82аÑ\82е!\n\n<img src=\"gps\">Ð\9cожеÑ\82е Ð¸ Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¾Ð²Ð° ÐºÐ¾Ð¿Ñ\87е Ð·Ð° Ð´Ð° Ð²Ð¸ Ñ\81е Ð¿Ñ\80икажаÑ\82 GPS Ñ\82Ñ\80агиÑ\82е Ð½Ð° Ñ\81иÑ\82е ÐºÐ¾Ñ\80иÑ\81ниÑ\86и (но Ð½Ðµ Ð¿Ð°Ñ\82ниÑ\82е Ñ\82оÑ\87ки) Ð·Ð° Ñ\82ековниоÑ\82 Ñ\80еон. Ð\94Ñ\80жеÑ\82е Shift Ð·Ð° Ð´Ð° Ñ\81е Ð¿Ñ\80икажаÑ\82 Ñ\81амо Ð²Ð°Ñ\88иÑ\82е Ñ\82Ñ\80аги.</bodyText>\n<column/><headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики</headline>\n<bodyText>Ð\9dе Ð³Ñ\80ижеÑ\82е Ñ\81е Ð°ÐºÐ¾ Ð½ÐµÐ¼Ð°Ñ\82е GPS-Ñ\83Ñ\80ед. Ð\92о Ð½ÐµÐºÐ¾Ð¸ Ð³Ñ\80адови Ð¸Ð¼Ð°Ð¼Ðµ Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\84оÑ\82огÑ\80аÑ\84ии Ð²Ñ\80з ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\86Ñ\80Ñ\82аÑ\82е, Ð´Ð¾Ð±Ð¸ÐµÐ½Ð¸ Ñ\81о Ð¿Ð¾Ð´Ð´Ñ\80Ñ\88ка Ð¾Ð´ Yahoo! (благодаÑ\80име!). Ð\98злезеÑ\82е Ð¸ Ð·Ð°Ð¿Ð¸Ñ\88еÑ\82е Ð³Ð¸ Ð¸Ð¼Ð¸Ñ\9aаÑ\82а Ð½Ð° Ñ\83лиÑ\86иÑ\82е, Ð¿Ð° Ð²Ñ\80аÑ\82еÑ\82е Ñ\81е Ð¸ Ð¸Ñ\81Ñ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ð³Ð¸ Ð»Ð¸Ð½Ð¸Ð¸Ñ\82е Ð²Ñ\80з Ð½Ð¸Ð².\n\n<img src='prefs'>Ð\94околкÑ\83 Ð½Ðµ Ð³Ð»ÐµÐ´Ð°Ñ\82е Ñ\81аÑ\82елиÑ\82Ñ\81ки Ñ\81лики, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° ÐºÐ¾Ð¿Ñ\87еÑ\82о Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aа Ð¸ Ð¿Ñ\80овеÑ\80еÑ\82е Ð´Ð°Ð»Ð¸ Ðµ Ð¾Ð´Ð±Ñ\80ано â\80\9eYahoo!â\80\9c Ð\90ко Ñ\81è Ñ\83Ñ\88Ñ\82е Ð½Ðµ Ð³Ð¸ Ð³Ð»ÐµÐ´Ð°Ñ\82е, Ñ\82огаÑ\88 Ð²ÐµÑ\80оÑ\98аÑ\82но Ñ\82акви Ñ\81лики Ñ\81е Ð½ÐµÐ´Ð¾Ñ\81Ñ\82апни Ð·Ð° Ð²Ð°Ñ\88иоÑ\82 Ð³Ñ\80ад, Ð¸Ð»Ð¸ Ð¿Ð°Ðº Ñ\82Ñ\80еба Ð¼Ð°Ð»ÐºÑ\83 Ð´Ð° Ð¾Ð´Ð´Ð°Ð»ÐµÑ\87иÑ\82е.\n\nÐ\9dа Ð¸Ñ\81Ñ\82ово ÐºÐ¾Ð¿Ñ\87е Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aа Ð¸Ð¼Ð° Ð¸ Ð´Ñ\80Ñ\83ги Ð¸Ð·Ð±Ð¾Ñ\80и ÐºÐ°ÐºÐ¾ ÐºÐ°Ñ\80Ñ\82и Ð½Ð° Ð\91Ñ\80иÑ\82аниÑ\98а Ñ\81о Ð¸Ñ\81Ñ\82еÑ\87ени Ð¿Ñ\80ава Ð¸ OpenTopoMap. Ð¡Ð¸Ñ\82е Ñ\82ие Ñ\81е Ñ\81пеÑ\86иÑ\98ално Ð¸Ð·Ð±Ñ\80ани Ð±Ð¸Ð´ÐµÑ\98Ñ\9cи Ð½Ð¸ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð´Ð° Ð³Ð¸ ÐºÐ¾Ñ\80иÑ\81Ñ\82име- Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ\80аÑ\98Ñ\82е Ð½Ð¸Ñ\87ии ÐºÐ°Ñ\80Ñ\82и Ð¸ Ð²Ð¾Ð·Ð´Ñ\83Ñ\88ни Ñ\84оÑ\82огÑ\80аÑ\84ии (Ð\97акониÑ\82е Ð·Ð° Ð°Ð²Ñ\82оÑ\80Ñ\81ки Ð¿Ñ\80ава Ñ\81е Ð·Ð° Ð½Ð¸ÐºÐ°Ð´Ðµ.)\n\nÐ\9fонекогаÑ\88 Ñ\81аÑ\82елиÑ\82Ñ\81киÑ\82е Ñ\81лики Ñ\81е Ð¼Ð°Ð»ÐºÑ\83 Ñ\80азмеÑ\81Ñ\82ени Ð¾Ð´ Ñ\84акÑ\82иÑ\87каÑ\82а Ð¼ÐµÑ\81Ñ\82оположба Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а. Ð\90ко Ð½Ð°Ð¸Ð´ÐµÑ\82е Ð½Ð° Ð¾Ð²Ð°, Ð´Ñ\80жеÑ\82е Ð³Ð¾ Space Ð¸ Ð²Ð»ÐµÑ\87еÑ\82е Ñ\98а Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð°Ñ\82а Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ñ\81е Ð¿Ð¾Ñ\80амнаÑ\82. Ð¡ÐµÐºÐ¾Ð³Ð°Ñ\88 Ð¸Ð¼Ð°Ñ\98Ñ\82е Ð´Ð¾Ð²ÐµÑ\80ба Ð²Ð¾ GPS Ñ\82Ñ\80агиÑ\82е, Ð° Ð½Ðµ Ñ\81аÑ\82елиÑ\82Ñ\81киÑ\82е Ñ\81лики.</bodytext>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 4: Ð¦Ñ\80Ñ\82аÑ\9aе\n\n--><page/><headline>ЦÑ\80Ñ\82аÑ\9aе Ð¿Ð°Ñ\82иÑ\88Ñ\82а</headline>\n<bodyText>Ð\97а Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82 Ð¿Ð¾Ñ\87нÑ\83ваÑ\98Ñ\9cи Ð¾Ð´ Ð¿Ñ\80азен Ð¿Ñ\80оÑ\81Ñ\82оÑ\80 Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а, Ñ\81амо ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ñ\82амÑ\83; Ð¿Ð¾Ñ\82оа Ð½Ð° Ñ\81екоÑ\98а Ñ\82оÑ\87ка Ð½Ð° Ð¿Ð°Ñ\82оÑ\82. Ð\9aога Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð´Ð²Ð° Ð¿Ð°Ñ\82и Ð¸Ð»Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Enter - Ð¿Ð¾Ñ\82оа ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½ÐµÐºÐ¾Ðµ Ð´Ñ\80Ñ\83го Ð¼ÐµÑ\81Ñ\82о Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð¿Ð°Ñ\82оÑ\82.\n\nÐ\97а Ð´Ð° Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82 Ð¿Ð¾Ñ\87нÑ\83ваÑ\98Ñ\9cи Ð¾Ð´ Ð´Ñ\80Ñ\83г Ð¿Ð°Ñ\82, ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¿Ð°Ñ\82оÑ\82 Ð·Ð° Ð´Ð° Ð³Ð¾ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е; Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ\82е Ñ\82оÑ\87ки Ñ\9cе Ñ\81Ñ\82анаÑ\82 Ñ\86Ñ\80вени. Ð\94Ñ\80жеÑ\82е Shift Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° ÐµÐ´Ð½Ð° Ð¾Ð´ Ð½Ð¸Ð² Ð·Ð° Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ\87неÑ\82е Ð½Ð¾Ð² Ð¿Ð°Ñ\82 Ð¾Ð´ Ñ\82аа Ñ\82оÑ\87ка. (Ð\90ко Ð½ÐµÐ¼Ð° Ñ\86Ñ\80вена Ñ\82оÑ\87ка Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86аÑ\82а, Ð½Ð°Ð¿Ñ\80авеÑ\82е Shift-клик Ð·Ð° Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98ави ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е!)\n\nÐ\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\97аÑ\87Ñ\83ваÑ\98â\80\9c (наÑ\98долÑ\83-деÑ\81но) ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови. Ð\97аÑ\87Ñ\83вÑ\83ваÑ\98Ñ\82е Ñ\87еÑ\81Ñ\82о, Ð²Ð¾ Ñ\81лÑ\83Ñ\87аÑ\98 Ð´Ð° Ñ\81е Ñ\98аваÑ\82 Ð¿Ñ\80облеми Ñ\81о Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82.\n\nÐ\9dе Ð¾Ñ\87екÑ\83ваÑ\98Ñ\82е Ð¿Ñ\80омениÑ\82е Ð²ÐµÐ´Ð½Ð°Ñ\88 Ð´Ð° Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ð½Ð° Ð³Ð»Ð°Ð²Ð½Ð°Ñ\82а ÐºÐ°Ñ\80Ñ\82а. Ð\97а Ð¾Ð²Ð° Ñ\82Ñ\80еба Ð´Ð° Ð¿Ð¾Ð¼Ð¸Ð½Ð°Ñ\82 Ñ\87аÑ\81-два, Ð° Ð²Ð¾ Ð½ÐµÐºÐ¾Ð¸ Ñ\81лÑ\83Ñ\87аи Ð¸ Ð´Ð¾ ÐµÐ´Ð½Ð° Ð½ÐµÐ´ÐµÐ»Ð°.\n</bodyText><column/><headline>Ð\9fÑ\80авеÑ\9aе ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86и</headline>\n<bodyText>Ð\9cногÑ\83 Ðµ Ð²Ð°Ð¶Ð½Ð¾ Ð¿Ð°Ñ\82иÑ\88Ñ\82аÑ\82а Ð´Ð° Ð¸Ð¼Ð°Ð°Ñ\82 Ð·Ð°ÐµÐ´Ð½Ð¸Ñ\87ка Ñ\82оÑ\87ка (â\80\9eÑ\98азолâ\80\9c) ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81е Ñ\81Ñ\80еÑ\9cавааÑ\82. Ð\9eва Ð¸Ð¼ Ñ\81лÑ\83жи Ð½Ð° ÐºÐ¾Ñ\80иÑ\81ниÑ\86иÑ\82е ÐºÐ¾Ð¸ Ð¿Ð»Ð°Ð½Ð¸Ñ\80ааÑ\82 Ð¿Ð°Ñ\82 Ð·Ð° Ð´Ð° Ð·Ð½Ð°Ð°Ñ\82 ÐºÐ°Ð´Ðµ Ð´Ð° Ñ\81вÑ\80Ñ\82аÑ\82.\n\nPotlatch Ñ\81е Ð³Ñ\80ижи Ð·Ð° Ð¾Ð²Ð° Ð´Ð¾ÐºÐ¾Ð»ÐºÑ\83 Ð²Ð½Ð¸Ð¼Ð°Ñ\82елно ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е <i>Ñ\82оÑ\87но</i> Ð½Ð° Ð¿Ð°Ñ\82оÑ\82 ÐºÐ¾Ñ\98 Ð³Ð¾ Ñ\81вÑ\80зÑ\83ваÑ\82е. Ð\93ледаÑ\98Ñ\82е Ð³Ð¸ Ð¾Ð»ÐµÑ\81ниÑ\82елниÑ\82е Ð·Ð½Ð°Ñ\86и: Ñ\82оÑ\87киÑ\82е Ñ\81веÑ\82нÑ\83вааÑ\82 Ñ\81ино, ÐºÑ\83Ñ\80Ñ\81оÑ\80оÑ\82 Ñ\81е Ð¼ÐµÐ½Ñ\83ва, Ð¸ ÐºÐ¾Ð³Ð° Ñ\81Ñ\82е Ð³Ð¾Ñ\82ови, Ñ\82оÑ\87каÑ\82а Ð½Ð° ÐºÑ\80Ñ\81Ñ\82оÑ\81ниÑ\86аÑ\82а Ð¸Ð¼Ð° Ñ\86Ñ\80на ÐºÐ¾Ð½Ñ\82Ñ\83Ñ\80а.</bodyText>\n<headline>Ð\9fомеÑ\81Ñ\82Ñ\83ваÑ\9aе Ð¸ Ð±Ñ\80иÑ\88еÑ\9aе</headline>\n<bodyText>Ð\9eва Ñ\80абоÑ\82и Ð±Ð°Ñ\88 ÐºÐ°ÐºÐ¾ Ñ\88Ñ\82о Ñ\81е Ð±Ð¸ Ñ\81е Ð¾Ñ\87екÑ\83вало. Ð\97а Ð´Ð° Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е Ñ\82оÑ\87ка, Ð¾Ð´Ð±ÐµÑ\80еÑ\82е Ñ\98а Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Ð½Ð° Delete. Ð\97а Ð´Ð° Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е Ñ\86ел ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82, Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Shift-Delete.\n\nÐ\97а Ð´Ð° Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82иÑ\82е Ð½ÐµÑ\88Ñ\82о, Ñ\81амо Ð¿Ð¾Ð²Ð»ÐµÑ\87еÑ\82е Ð³Ð¾. (Ð\8cе Ñ\82Ñ\80еба Ð´Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð¸ Ð´Ð° Ð¿Ð¾Ð´Ñ\80жиÑ\82е Ð¼Ð°Ð»ÐºÑ\83 Ð¿Ñ\80ед Ð´Ð° Ð²Ð»ÐµÑ\87еÑ\82е. Ð¡Ð¾ Ð¾Ð²Ð° Ñ\81е Ð¸Ð·Ð±ÐµÐ³Ð½Ñ\83вааÑ\82 Ð½ÐµÐ½Ð°Ð¼ÐµÑ\80ни Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82Ñ\83ваÑ\9aа.)</bodyText>\n<column/><headline>Ð\9fонапÑ\80едно Ñ\86Ñ\80Ñ\82аÑ\9aе</headline>\n<bodyText><img src=\"scissors\">Ð\90ко Ð´Ð²Ð° Ð´ÐµÐ»Ð° Ð¾Ð´ ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82 Ð¸Ð¼Ð°Ð°Ñ\82 Ñ\80азлиÑ\87ни Ð¸Ð¼Ð¸Ñ\9aа, Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° Ð³Ð¸ Ñ\80аздвоиÑ\82е. Ð\9aликнеÑ\82е Ð½Ð° Ð¿Ð°Ñ\82оÑ\82; Ð¿Ð¾Ñ\82оа ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð²Ð¾ Ñ\82оÑ\87каÑ\82а ÐºÐ°Ð´ÐµÑ\88Ñ\82о Ñ\81акаÑ\82е Ð´Ð° Ð³Ð¾ Ñ\80аздвоиÑ\82е, Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½Ð¾Ð¶Ð¸Ñ\86иÑ\82е. (Ð\9cожеÑ\82е Ð´Ð° Ñ\81поÑ\98Ñ\83ваÑ\82е Ð¿Ð°Ñ\82иÑ\88Ñ\82а Ñ\81о Control, Ð¸Ð»Ð¸ ÐºÐ¾Ð¿Ñ\87еÑ\82о Ñ\81о Ñ\98аболко Ð½Ð° Ð\9cекинÑ\82оÑ\88, Ð½Ð¾ Ð½Ðµ Ñ\81поÑ\98Ñ\83ваÑ\98Ñ\82е Ð´Ð²Ð° Ð¿Ð°Ñ\82а Ñ\81о Ñ\80азлиÑ\87ни Ð¸Ð¼Ð¸Ñ\9aа Ð¸Ð»Ð¸ Ñ\82ипови.)\n\n<img src=\"tidy\">Ð\9aÑ\80Ñ\83жниÑ\82е Ñ\82екови Ñ\81е Ð¼Ð½Ð¾Ð³Ñ\83 Ñ\82еÑ\88ки Ð·Ð° Ñ\86Ñ\80Ñ\82аÑ\9aе. Ð\9dо Ð·Ð° Ñ\82оа Ð¿Ð¾Ð¼Ð°Ð³Ð° Ñ\81амиоÑ\82 Potlatch. Ð\9dаÑ\86Ñ\80Ñ\82аÑ\98Ñ\82е Ð³Ð¾ ÐºÑ\80Ñ\83гоÑ\82 Ð³Ñ\80Ñ\83бо, Ñ\81амо Ð²Ð½Ð¸Ð¼Ð°Ð²Ð°Ñ\98Ñ\82е Ð´Ð° Ð³Ð¸ Ñ\81поиÑ\82е ÐºÑ\80аевиÑ\82е (Ñ\82.е. Ð´Ð° Ð±Ð¸Ð´Ðµ ÐºÑ\80Ñ\83г), Ð¸ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eподÑ\80едиâ\80\9c. (Ð\9eва Ñ\81е ÐºÐ¾Ñ\80иÑ\81Ñ\82и Ð¸ Ð·Ð° Ð¸Ñ\81пÑ\80аваÑ\9aе Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82а.)</bodyText>\n<headline>ТоÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81 (POI)</headline>\n<bodyText>Ð\9fÑ\80воÑ\82о Ð½ÐµÑ\88Ñ\82о Ñ\88Ñ\82о Ð³Ð¾ Ð½Ð°Ñ\83Ñ\87ивÑ\82е Ðµ ÐºÐ°ÐºÐ¾ Ð´Ð° Ð²Ð»ÐµÑ\87еÑ\82е Ð¸ Ð¿Ñ\83Ñ\88Ñ\82аÑ\82е Ñ\82оÑ\87ка Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81. Ð\9cожеÑ\82е Ð¸ Ñ\81амиÑ\82е Ð´Ð° Ð¿Ñ\80авиÑ\82е Ð²Ð°ÐºÐ²Ð¸ Ñ\82оÑ\87ки Ñ\81о Ð´Ð²Ð¾Ñ\98но ÐºÐ»Ð¸ÐºÐ½Ñ\83ваÑ\9aе Ð½Ð° ÐºÐ°Ñ\80Ñ\82аÑ\82а: Ñ\9cе Ñ\81е Ð¿Ð¾Ñ\98ави Ð·ÐµÐ»ÐµÐ½Ð¾ ÐºÑ\80Ñ\83гÑ\87е. Ð\9dо ÐºÐ°ÐºÐ¾ Ñ\9cе Ð·Ð½Ð°ÐµÐ¼Ðµ Ð´Ð°Ð»Ð¸ Ñ\81е Ñ\80абоÑ\82и Ð·Ð° Ñ\80еÑ\81Ñ\82оÑ\80ан, Ñ\86Ñ\80ква Ð¸Ð»Ð¸ Ð½ÐµÑ\88Ñ\82о Ð´Ñ\80Ñ\83го? Ð\9aликнеÑ\82е Ð½Ð° â\80\9eÐ\9eзнаÑ\87Ñ\83ваÑ\9aеâ\80\9c Ð¿Ð¾Ð³Ð¾Ñ\80е Ð·Ð° Ð´Ð° Ð´Ð¾Ð·Ð½Ð°ÐµÑ\82е!\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 4: Ð\9eзнаÑ\87Ñ\83ваÑ\9aе\n\n--><page/><headline>Ð\9aоÑ\98 Ð²Ð¸Ð´ Ð½Ð° Ð¿Ð°Ñ\82 Ðµ Ñ\82оа?</headline>\n<bodyText>ШÑ\82ом Ñ\9cе Ð½Ð°Ñ\86Ñ\80Ñ\82аÑ\82е Ð¿Ð°Ñ\82, Ñ\82Ñ\80еба Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ\87иÑ\82е Ñ\88Ñ\82о Ðµ. Ð\94али Ðµ Ð³Ð»Ð°Ð²Ð½Ð° Ð¼Ð°Ð³Ð¸Ñ\81Ñ\82Ñ\80ала, Ð¿ÐµÑ\88аÑ\87ка Ð¿Ð°Ñ\82ека Ð¸Ð»Ð¸ Ñ\80ека? Ð\9aако Ñ\81е Ð²Ð¸ÐºÐ°? Ð\98ма Ð»Ð¸ Ð½ÐµÐºÐ¾Ð¸ Ð¿Ð¾Ñ\81ебни Ð¿Ñ\80авила (на Ð¿Ñ\80. â\80\9eзабÑ\80анеÑ\82о Ð²ÐµÐ»Ð¾Ñ\81ипедиâ\80\9c)?\n\nÐ\92о OpenStreetMap Ð¾Ð²Ð° Ð³Ð¾ Ð·Ð°Ð¿Ð¸Ñ\88Ñ\83ваÑ\82е Ñ\81о â\80\9eознакиâ\80\9c. Ð\9eзнакаÑ\82а Ð¸Ð¼Ð° Ð´Ð²Ð° Ð´ÐµÐ»Ð°, Ð¸ Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82иÑ\82е ÐºÐ¾Ð»ÐºÑ\83 Ñ\88Ñ\82о Ñ\81акаÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸. Ð\9dа Ð¿Ñ\80имеÑ\80, Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е i>highway | trunk</i> Ð·Ð° Ð´Ð° Ð½Ð°Ð·Ð½Ð°Ñ\87иÑ\82е Ð´ÐµÐºÐ° Ð¾Ð²Ð° Ðµ Ð³Ð»Ð°Ð²ÐµÐ½ Ð¼Ð°Ð³Ð¸Ñ\81Ñ\82Ñ\80ален Ð¿Ð°Ñ\82; <i>highway | residential</i> Ð·Ð° Ð¿Ð°Ñ\82 Ð²Ð¾ Ð½Ð°Ñ\81елба; or <i>highway | footway</i> Ð·Ð° Ð¿ÐµÑ\88аÑ\87ка Ð¿Ð°Ñ\82ека. If bikes were banned, you could then add <i>bicycle | no</i>. Ð\9fоÑ\82оа, Ð·Ð° Ð´Ð° Ð³Ð¾ Ð·Ð°Ð¿Ð¸Ñ\88еÑ\82е Ð¸Ð¼ÐµÑ\82о, Ð´Ð¾Ð´Ð°Ñ\98Ñ\82е <i>name | Ð\9fаÑ\80Ñ\82изанÑ\81ки Ð\9eдÑ\80еди</i>.\n\nÐ\9eзнакиÑ\82е Ð½Ð° Potlatch Ñ\81е Ð¿Ð¾Ñ\98авÑ\83вааÑ\82 Ð½Ð°Ñ\98долÑ\83 Ð½Ð° ÐµÐºÑ\80аноÑ\82 - ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð¿Ð¾Ñ\81Ñ\82оеÑ\87ка Ñ\83лиÑ\86а, Ð¸ Ñ\9cе Ð²Ð¸Ð´Ð¸Ñ\82е ÐºÐ°ÐºÐ²Ð° Ð¾Ð·Ð½Ð°ÐºÐ° Ð¸Ð¼Ð°. Ð\9aликеÑ\82е Ð½Ð° Ð·Ð½Ð°ÐºÐ¾Ñ\82 â\80\9e\80\9c (наÑ\98долÑ\83-деÑ\81но) Ð·Ð° Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е Ð½Ð¾Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÐ°. Ð¡ÐµÐºÐ¾Ñ\98а Ð¾Ð·Ð½Ð°ÐºÐ° Ð¸Ð¼Ð° â\80\9e\80\9c Ñ\81о Ñ\88Ñ\82о Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ñ\98а Ð¸Ð·Ð±Ñ\80иÑ\88еÑ\82е.\n\nÐ\9cожеÑ\82е Ð´Ð° Ð¾Ð·Ð½Ð°Ñ\87Ñ\83ваÑ\82е Ñ\86ели Ð¿Ð°Ñ\82иÑ\88Ñ\82а; Ñ\82оÑ\87ки Ð½Ð° Ð¿Ð°Ñ\82иÑ\88Ñ\82а (можеби Ð¿Ð¾Ñ\80Ñ\82а Ð¸Ð»Ð¸ Ñ\81емаÑ\84оÑ\80и); Ð¸ Ñ\82оÑ\87ки Ð¾Ð´ Ð¸Ð½Ñ\82еÑ\80еÑ\81.</bodytext>\n<column/><headline>Ð\9aоÑ\80иÑ\81Ñ\82еÑ\9aе Ð½Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¸</headline>\n<bodyText>Ð\97а Ð´Ð° Ð²Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ðµ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ\87неÑ\82е, Potlatch Ð²Ð¸ Ð½Ñ\83ди Ð³Ð¾Ñ\82ови, Ð½Ð°Ñ\98попÑ\83лаÑ\80ни Ð¾Ð·Ð½Ð°ÐºÐ¸.\n\n<img src=\"preset_road\">Ð\9eдбеÑ\80еÑ\82е Ð³Ð¾ Ð¿Ð°Ñ\82оÑ\82, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ°Ñ\98Ñ\82е Ð½Ð¸Ð· Ñ\81имболиÑ\82е Ð´Ð¾Ð´ÐµÐºÐ° Ð½Ðµ Ð½Ð°Ñ\98деÑ\82е Ñ\81оодвеÑ\82ен. Ð\9fоÑ\82оа Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ñ\98а Ð½Ð°Ñ\98Ñ\81оодвеÑ\82наÑ\82а Ð¼Ð¾Ð¶Ð½Ð¾Ñ\81Ñ\82 Ð¾Ð´ Ð¼ÐµÐ½Ð¸Ñ\82о.\n\nСо Ð¾Ð²Ð° Ñ\81е Ð¿Ð¾Ð¿Ð¾Ð»Ð½Ñ\83вааÑ\82 Ð¾Ð·Ð½Ð°ÐºÐ¸Ñ\82е. Ð\9dекои Ñ\9cе Ð¾Ñ\81Ñ\82анаÑ\82 Ð´ÐµÐ»Ñ\83мно Ð¿Ñ\80азни Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶ÐµÑ\82е Ð´Ð° Ð²Ð¿Ð¸Ñ\88еÑ\82е (на Ð¿Ñ\80имеÑ\80) Ð¸Ð¼Ðµ Ð½Ð° Ñ\83лиÑ\86аÑ\82а Ð¸ Ð±Ñ\80оÑ\98</bodyText>\n<headline>Ð\95днонаÑ\81оÑ\87ни Ð¿Ð°Ñ\82иÑ\88Ñ\82а</headline>\n<bodyText>Ð\92и Ð¿Ñ\80епоÑ\80аÑ\87Ñ\83ваме Ð´Ð° Ð´Ð¾Ð´Ð°Ð´ÐµÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ° Ð·Ð° ÐµÐ´Ð½Ð¾Ð½Ð°Ñ\81оÑ\87ни Ñ\83лиÑ\86и ÐºÐ°ÐºÐ¾ <i>oneway | yes</i> - Ð½Ð¾ ÐºÐ°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ð·Ð½Ð°ÐµÑ\82е Ð²Ð¾ ÐºÐ¾Ñ\98а Ð½Ð°Ñ\81ока? Ð\9dаÑ\98долÑ\83-лево Ð¸Ð¼Ð° Ñ\81Ñ\82Ñ\80елка ÐºÐ¾Ñ\98а Ð³Ð¾ Ð¾Ð·Ð½Ð°Ñ\87Ñ\83ва Ð¿Ñ\80авеÑ\86оÑ\82 Ð½Ð°Ð¿Ð°Ñ\82оÑ\82, Ð¾Ð´ Ð¿Ð¾Ñ\87еÑ\82ок Ð´Ð¾ ÐºÑ\80аÑ\98. Ð\9aликнеÑ\82е Ð½Ð° Ð½ÐµÐ° Ð·Ð° Ð´Ð° Ñ\98а Ñ\81вÑ\80Ñ\82иÑ\82е Ð¾Ð±Ñ\80аÑ\82но.</bodyText>\n<column/><headline>Ð\98збоÑ\80 Ð½Ð° Ð²Ð°Ñ\88и Ñ\81опÑ\81Ñ\82вени Ð¾Ð·Ð½Ð°ÐºÐ¸</headline>\n<bodyText>Секако, Ð½Ðµ Ñ\81Ñ\82е Ð¾Ð³Ñ\80аниÑ\87ени Ñ\81амо Ð½Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸. Ð\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ð³Ð¾ ÐºÐ¾Ð¿Ñ\87еÑ\82о â\80\9e\80\9c  Ð·Ð° Ð´Ð° ÐºÐ¾Ñ\80иÑ\81Ñ\82иÑ\82е ÐºÐ°ÐºÐ²Ð¸ Ñ\88Ñ\82о Ñ\81акаÑ\82е Ð¾Ð·Ð½Ð°ÐºÐ¸.\n\nÐ\9cожеÑ\82е Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ\82е ÐºÐ°ÐºÐ²Ð¸ Ð¾Ð·Ð½Ð°ÐºÐ¸ ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ð´Ñ\80Ñ\83гиÑ\82е Ð½Ð° <a href=\"http://osmdoc.com/en/tags/\" target=\"_blank\">OSMdoc</a>, Ð° Ð¸Ð¼Ð°Ð¼Ðµ Ð¸ Ð´Ð¾Ð»Ð³ Ñ\81пиÑ\81ок Ð½Ð° Ð¿Ð¾Ð¿Ñ\83лаÑ\80ни Ð¾Ð·Ð½Ð°ÐºÐ¸ Ð½Ð° Ð½Ð°Ñ\88еÑ\82о Ð²Ð¸ÐºÐ¸ Ð½Ð°Ñ\80еÑ\87ена<a href=\"http://wiki.openstreetmap.org/wiki/Map_Features\" target=\"_blank\">Ð\95леменÑ\82и</a>. Ð\9dо Ñ\82ие Ñ\81е <i>Ñ\81амо Ð¿Ñ\80едлози, Ð° Ð½Ðµ Ð¿Ñ\80авила</i>. Ð\9dаÑ\98Ñ\81лободно Ð¸Ð·Ð¼Ð¸Ñ\81лÑ\83ваÑ\98Ñ\82е Ñ\81и Ñ\81вои Ð¾Ð·Ð½Ð°ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿Ñ\80еземаÑ\98Ñ\82е Ð¾Ð´ Ð´Ñ\80Ñ\83ги ÐºÐ¾Ñ\80иÑ\81ниÑ\86и.\n\nÐ\91идеÑ\98Ñ\9cи Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86иÑ\82е Ð¾Ð´ OpenStreetMap Ñ\81е ÐºÐ¾Ñ\80иÑ\81Ñ\82аÑ\82 Ð·Ð° Ð¸Ð·Ñ\80абоÑ\82Ñ\83ваÑ\9aе Ð½Ð° Ñ\80азлиÑ\87ни ÐºÐ°Ñ\80Ñ\82и, Ñ\81екоÑ\98а ÐºÐ°Ñ\80Ñ\82а Ð¿Ñ\80икажÑ\83ва Ñ\81воÑ\98 Ð¸Ð·Ð±Ð¾Ñ\80 Ð¾Ð´ Ð¾Ð·Ð½Ð°ÐºÐ¸.</bodyText>\n<headline>РелаÑ\86ии</headline>\n<bodyText>Ð\9fонекогаÑ\88 Ð½Ðµ Ñ\81е Ð´Ð¾Ð²Ð¾Ð»Ð½Ð¸ Ñ\81амо Ð¾Ð·Ð½Ð°ÐºÐ¸, Ð¿Ð° Ñ\9cе Ñ\82Ñ\80еба Ð´Ð° â\80\9eгÑ\80Ñ\83пиÑ\80аÑ\82еâ\80\9c Ð´Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ\9cе Ð¿Ð°Ñ\82а. Ð\9cожеби Ð²Ñ\80Ñ\82еÑ\9aеÑ\82о Ð¾Ð´ ÐµÐ´Ð½Ð° Ñ\83лиÑ\86а Ð²Ð¾ Ð´Ñ\80Ñ\83га Ðµ Ð·Ð°Ð±Ñ\80анеÑ\82о, Ð¸Ð»Ð¸ Ð¿Ð°Ðº 20 Ð¿Ð°Ñ\82еки Ð·Ð°ÐµÐ´Ð½Ð¾ Ñ\81оÑ\87иннÑ\83вааÑ\82 Ð¾Ð·Ð½Ð°Ñ\87ена Ð²ÐµÐ»Ð¾Ñ\81ипедÑ\81ка Ð¿Ð°Ñ\82ека. Ð\9eва Ñ\81е Ð¿Ñ\80ави Ð²Ð¾ Ð½Ð°Ð¿Ñ\80едноÑ\82о Ð¼ÐµÐ½Ð¸ â\80\9eÑ\80елаÑ\86ииâ\80\9c. <a href=\"http://wiki.openstreetmap.org/wiki/Relations\" target=\"_blank\">Ð\94ознаÑ\98Ñ\82е Ð¿Ð¾Ð²ÐµÑ\9cе</a> Ð½Ð° Ð²Ð¸ÐºÐ¸Ñ\82о.</bodyText>\n\n<!--\n========================================================================================================================\nСÑ\82Ñ\80аниÑ\86а 6: Ð\9eÑ\82Ñ\81Ñ\82Ñ\80анÑ\83ваÑ\9aе Ð½ÐµÐ¸Ñ\81пÑ\80авноÑ\81Ñ\82и\n\n--><page/><headline>Ð\92Ñ\80аÑ\9cаÑ\9aе Ð³Ñ\80еÑ\88ки</headline>\n<bodyText><img src=\"undo\">Ð\9eва Ðµ ÐºÐ¾Ð¿Ñ\87еÑ\82о Ð·Ð° Ð²Ñ\80аÑ\9cаÑ\9aе (може Ð¸ Ñ\81о Ñ\81Ñ\82иÑ\81каÑ\9aе Ð½Ð° Z) - Ð¾Ð²Ð° Ñ\9cе Ð³Ð¾ Ð²Ñ\80аÑ\82и Ð¿Ð¾Ñ\81ледноÑ\82о Ð½ÐµÑ\88Ñ\82о ÐºÐ¾Ðµ Ñ\81Ñ\82е Ð³Ð¾ Ð½Ð°Ð¿Ñ\80авиле.\n\nÐ\9cожеÑ\82е Ð´Ð° â\80\9eвÑ\80аÑ\82иÑ\82еâ\80\9c Ð¿Ñ\80еÑ\82Ñ\85одно Ð·Ð°Ñ\87Ñ\83вана Ð²ÐµÑ\80зиÑ\98а Ð½Ð° ÐµÐ´ÐµÐ½ Ð¿Ð°Ñ\82 Ð¸Ð»Ð¸ Ñ\82оÑ\87ка. Ð\9eдбеÑ\80еÑ\82е Ñ\98а, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° Ð½ÐµÑ\98зиниоÑ\82 Ð¸Ð´. Ð±Ñ\80. (бÑ\80оÑ\98оÑ\82 Ð½Ð°Ñ\98долÑ\83-лево) - Ð¸Ð»Ð¸ Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е Ð½Ð° H (за â\80\9eиÑ\81Ñ\82оÑ\80иÑ\98аâ\80\9c). Ð\8cе Ð²Ð¸Ð´Ð¸Ñ\82е Ñ\81пиÑ\81ок Ð½Ð° ÐºÐ¾Ñ\98а Ñ\81е Ð½Ð°Ð²ÐµÐ´Ñ\83ва ÐºÐ¾Ñ\98 Ñ\98а Ñ\83Ñ\80едÑ\83вал Ð¸ ÐºÐ¾Ð³Ð°. Ð\9eдбеÑ\80еÑ\82е Ñ\98а Ñ\81аканаÑ\82а Ð²ÐµÑ\80зиÑ\98а, Ð¸ Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eÐ\92Ñ\80аÑ\82иâ\80\9c.\n\nÐ\94околкÑ\83 Ñ\81Ñ\82е Ð¸Ð·Ð±Ñ\80иÑ\88але Ð¿Ð°Ñ\82 Ð¿Ð¾ Ð³Ñ\80еÑ\88ка Ð¸ Ñ\81Ñ\82е Ð·Ð°Ñ\87Ñ\83вале, Ð¿Ñ\80иÑ\82иÑ\81неÑ\82е U (за Ð´Ð° Ð²Ñ\80аÑ\82иÑ\82е). Ð\8cе Ñ\81е Ð¿Ð¾Ñ\98аваÑ\82 Ñ\81иÑ\82е Ð¸Ð·Ð±Ñ\80иÑ\88ани Ð¿Ð°Ñ\82иÑ\88Ñ\82а. Ð\9eдбеÑ\80еÑ\82е Ð³Ð¾ Ñ\81аканиоÑ\82 Ð¿Ð°Ñ\82; Ð¾Ñ\82клÑ\83Ñ\87еÑ\82е Ð³Ð¾ Ñ\81о ÐºÐ»Ð¸ÐºÐ½Ñ\83ваÑ\9aе Ð½Ð° ÐºÐ°Ñ\82анÑ\87еÑ\82о; Ð¸ Ð·Ð°Ñ\87Ñ\83ваÑ\98Ñ\82е.\n\nÐ\9cиÑ\81лиÑ\82е Ð´ÐµÐºÐ° Ð½ÐµÐºÐ¾Ñ\98 Ð´Ñ\80Ñ\83г ÐºÐ¾Ñ\80иÑ\81ник Ð½Ð°Ð¿Ñ\80авил Ð³Ñ\80еÑ\88ка? Ð\98Ñ\81пÑ\80аÑ\82еÑ\82е Ð¼Ñ\83 Ð¿Ñ\80иÑ\98аÑ\82елÑ\81ка Ð¿Ð¾Ñ\80ака. Ð\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ñ\98а Ð¸Ñ\81Ñ\82оÑ\80иÑ\98аÑ\82а (H) Ð·Ð° Ð´Ð° Ð¼Ñ\83 Ð³Ð¾ Ð¸Ð·Ð±ÐµÑ\80еÑ\82е Ð¸Ð¼ÐµÑ\82о, Ð¿Ð° ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÐ\9fоÑ\88Ñ\82аâ\80\9c\n\nÐ\9aоÑ\80иÑ\81Ñ\82еÑ\82е Ð³Ð¾ Ð\98нÑ\81пекÑ\82оÑ\80оÑ\82 (во Ð¼ÐµÐ½Ð¸Ñ\82о â\80\9eÐ\9dапÑ\80едноâ\80\9c) Ð·Ð° ÐºÐ¾Ñ\80иÑ\81ни Ð¸Ð½Ñ\84оÑ\80маÑ\86ии Ð·Ð° Ð¼Ð¾Ð¼ÐµÐ½Ñ\82алниоÑ\82 Ð¿Ð°Ñ\82 Ð¸Ð»Ð¸ Ñ\82оÑ\87ка.\n</bodyText><column/><headline>ЧÐ\9fÐ\9f</headline>\n<bodyText><b>Ð\9aако Ð´Ð° Ð³Ð¸ Ð²Ð¸Ð´Ð°Ð¼ Ð¼Ð¾Ð¸Ñ\82е Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки?</b>\nÐ\9fаÑ\82ниÑ\82е Ñ\82оÑ\87ки Ñ\81е Ð¿Ð¾Ñ\98авÑ\83вааÑ\82 Ñ\81амо Ð°ÐºÐ¾ ÐºÐ»Ð¸ÐºÐ½ÐµÑ\82е Ð½Ð° â\80\9eÑ\83Ñ\80едиâ\80\9c Ð´Ð¾ Ð¸Ð¼ÐµÑ\82о Ð½Ð° Ñ\82Ñ\80агаÑ\82а Ð²Ð¾ â\80\9eGPS Ñ\82Ñ\80агиâ\80\9c. Ð\9fодаÑ\82оÑ\82екаÑ\82а Ð¼Ð¾Ñ\80а Ð´Ð° Ð¸Ð¼Ð° Ð¸ Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки Ð¸ Ð·Ð°Ð¿Ð¸Ñ\81 Ð½Ð° Ñ\82Ñ\80агаÑ\82а - Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82 Ð½Ðµ Ð¿Ñ\80опÑ\83Ñ\88Ñ\82а Ð¿Ð¾Ð´Ð°Ñ\82оÑ\82еки ÐºÐ¾Ð¸ Ð¸Ð¼Ð°Ð°Ñ\82 Ñ\81амо Ð¿Ð°Ñ\82ни Ñ\82оÑ\87ки.\n\nÐ\9fовеÑ\9cе Ð§Ð\9fÐ\9f Ð·Ð° <a href=\"http://wiki.openstreetmap.org/wiki/Potlatch/FAQs\" target=\"_blank\">Potlatch</a> Ð¸ <a href=\"http://wiki.openstreetmap.org/wiki/FAQ\" target=\"_blank\">OpenStreetMap</a>.\n</bodyText>\n\n\n<column/><headline>Ð\9fобÑ\80зо Ñ\80абоÑ\82еÑ\9aе</headline>\n<bodyText>ШÑ\82о Ð¿Ð¾Ð²ÐµÑ\9cе Ð¾Ð´Ð´Ð°Ð»ÐµÑ\87Ñ\83ваÑ\82е, Ñ\82оа Ð¿Ð¾Ð²ÐµÑ\9cе Ð¿Ð¾Ð´Ð°Ñ\82оÑ\86и Ð¼Ð¾Ñ\80а Ð´Ð° Ð²Ñ\87иÑ\82а Potlatch. Ð\9fÑ\80иближеÑ\82е Ð¿Ñ\80ед Ð´Ð° Ñ\81Ñ\82иÑ\81неÑ\82е Ð½Ð° â\80\9eУÑ\80едиâ\80\9c\n\nÐ\98Ñ\81клÑ\83Ñ\87еÑ\82е Ð³Ð¾ â\80\9eÐ\9aоÑ\80иÑ\81Ñ\82и ÐºÑ\83Ñ\80Ñ\81оÑ\80и â\80\9eмоливâ\80\9c Ð¸ â\80\9eÑ\80акаâ\80\9câ\80\9c (во Ð¿Ñ\80озоÑ\80еÑ\86оÑ\82 Ð·Ð° Ð¿Ñ\80илагодÑ\83ваÑ\9aе) Ð·Ð° Ð´Ð° Ð´Ð¾Ð±Ð¸ÐµÑ\82е Ð¼Ð°ÐºÑ\81имална Ð±Ñ\80зина.\n\nÐ\90ко Ð¾Ð¿Ñ\81лÑ\83жÑ\83ваÑ\87оÑ\82 Ñ\80абоÑ\82и Ð±Ð°Ð²Ð½Ð¾, Ð²Ñ\80аÑ\82еÑ\82е Ñ\81е Ð¿Ð¾Ð´Ð¾Ñ\86на. <a href=\"http://wiki.openstreetmap.org/wiki/Platform_Status\" target=\"_blank\">Ð\9fÑ\80овеÑ\80еÑ\82е Ð³Ð¾ Ð²Ð¸ÐºÐ¸Ñ\82о</a> Ð·Ð° Ð´Ð° Ð¿Ñ\80овеÑ\80иÑ\82е Ð¿Ð¾Ð·Ð½Ð°Ñ\82и Ð¿Ñ\80облеми. Ð\9dекои Ñ\82еÑ\80мини ÐºÐ°ÐºÐ¾ Ð½ÐµÐ´ÐµÐ»Ð° Ð½Ð°Ð²ÐµÑ\87еÑ\80 Ñ\81е Ñ\81екогаÑ\88 Ð¾Ð¿Ñ\82оваÑ\80ени.\n\nÐ\9aажеÑ\82е Ð¼Ñ\83 Ð½Ð° Potlatch Ð´Ð° Ð³Ð¸ Ð·Ð°Ð¿Ð¾Ð¼Ð½и вашите омилени комплети со ознаки. Одберете пат или точка со тие ознаки, па притиснете на Ctrl, Shift и на број од 1 до 9. Потоа за повторно да ги користите тие ознаки, само притиснете  Shift и тој број. (Ќе се паметат секојпат кога го користите Potlatch на овој сметач.)\n\nПретворете ја вашата GPS трага во пат со тоа што ќе ја пронајдете на списокот „GPS траги“ и ќе кликнете на „уреди“ до неа, а потоа на кутивчето „претвори“. Трагата ќе се заклучи (црвено), затоа не зачувувајте. Најпрвин уредете ја, па кликнете на катанчето (најдолу-десно) за да ја отклучите кога сте спремни да ја зачувате.</bodytext>\n\n<!--\n========================================================================================================================\nСтраница 7: Брза помош\n\n--><page/><headline>Што да кликате</headline>\n<bodyText><b>Влечете ја картата</b> за да се движите наоколу.\n<b>Двоен клик</b> за  да направите нова точка од интерес (POI).\n<b>Кликнете еднап</b> за да започнете нов пат.\n<b>Држете и влечете пат или точка од интерес (POI)</b> за да ги поместите.</bodyText>\n<headline>Кога цртате пат</headline>\n<bodyText><b>Двоен клик</b> или <b>Enter</b> за да завршите со цртање.\n<b>Кликнете</b> на друг пат за да направите крстосница.\n<b>Shift-клик на крајот на друг пат</b> за да споите.</bodyText>\n<headline>Кога ќе изберете пат</headline>\n<bodyText><b>Кликнете на точката</b> за да ја одберете.\n<b>Shift-клик на патот</b> за да вметнете нова точка.\n<b>Shift-клик на точка</b> за оттаму да започнете нов пат.\n<b>Ctrl-клик на друг пат</b> за спојување.</bodyText>\n</bodyText>\n<column/><headline>Тастатурни кратенки</headline>\n<bodyText><textformat tabstops='[25]'>B Додај позадинска изворна ознака\nC Затвори измени\nG Прикажи GPS траги\nH Прикажи историја\nI Прикажи инспектор\nJ сврзи точка за вкрстени патишта\n(+Shift) Unjoin from other ways\nK Заклучи/отклучи го моментално избраното\nL Прикажи моментална географска должина\nM Зголеми уредувачки прозорец\nP Создај паралелен пат\nR Повтори ги ознаките\nS Зачувај (освен ако не е во живо)\nT Подреди во права линија/круг\nU Врати избришано (прикажи избришани патишра)\nX Пресечи пат на две\nZ Врати\n- Отстрани точка само од овој пат\n+ Додај нова ознака\n/ Избор на друг пат со истава точка\n</textformat><textformat tabstops='[50]'>Delete Избриши точка\n  (+Shift) Избриши цел пат\nEnter Заврши со цртање на линијата\nSpace Држи и влечи позадина\nEsc Откажи го ова уредување; превчитај од опслужувачот \n0 Отстрани ги сите ознаки\n1-9 Избор на зададени ознаки\n  (+Shift) Избери запамтени ознаки\n  (+S/Ctrl) Запамти ознаки\n§ или ` Кружи помеѓу групи ознаки\n</textformat>\n</bodyText>"
   hint_drawmode: кликнете за да додадете точка,\nдвоен клик/Ентер\nза да ја завршите линијата
   hint_latlon: "Г.Ш. $1\nГ.Д. $2"
   hint_loading: вчитувам податоци
index 1bb152eda8c5ab75b84d7747ec835273a1497510..167c13f098137002c7a15563f6ba48ac6f25d745 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: McDutchie
+# Author: Naudefj
 # Author: Siebrand
 nl: 
   a_poi: $1 een POI
@@ -95,7 +96,7 @@ nl:
   inspector_in_ways: In wegen
   inspector_latlon: "Breedte $1\nLengte $2"
   inspector_locked: Op slot
-  inspector_node_count: "{$1 keer)"
+  inspector_node_count: ($1 keer)
   inspector_not_in_any_ways: Niet in een weg (POI)
   inspector_unsaved: Niet opgeslagen
   inspector_uploading: (bezig met uploaden)
index 4946784bbcb8a0e86daf174a4e5d22d925b481e7..0cc2eb460909ddc73443aca5f4478714bd43df03 100644 (file)
@@ -187,7 +187,7 @@ pt-BR:
   preset_icon_theatre: Teatro
   preset_tip: Escolha dentre um menu de tags que descrevam $1
   prompt_addtorelation: Adicionar $1 a uma relação
-  prompt_changesetcomment: "Entre com uma descrição das suas mudanças:"
+  prompt_changesetcomment: "Descreva as suas mudanças:"
   prompt_closechangeset: fechar changeset $1
   prompt_createparallel: Criar caminho paralelo
   prompt_editlive: Editar ao vivo
index bfe2ec0421b514d738b22b754e9a0ac43dac8424..0bfdce8f5ea5dc31e6bd2c7f7fc321373f9c44be 100644 (file)
@@ -3,7 +3,10 @@
 # Export driver: syck
 # Author: Dbc334
 sl: 
+  a_poi: $1 POI
+  action_createpoi: ustvariti POI
   action_deletepoint: brisanje točke
+  action_movepoi: prestaviti POI
   advanced: Napredno
   advanced_maximise: Maksimiraj okno
   advanced_minimise: Minimiraj okno
@@ -12,6 +15,7 @@ sl:
   cancel: Prekliči
   conflict_download: Prenesi njihovo različico
   conflict_overwrite: Prepiši njihovo različico
+  custom: "Po meri:"
   delete: Izbriši
   deleting: brisanje
   editingoffline: Urejanje brez povezave
index af916275dd1713304b9ec2e3c34b9c0ab13b5af9..2dabc0ece5bab238fee153cecc0a96c57d6f9294 100644 (file)
@@ -1,12 +1,15 @@
 # Messages for Turkish (Türkçe)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Alerque
 # Author: Katpatuka
 tr: 
   a_poi: "POI: $1"
   a_way: "yol: $1"
   action_addpoint: yolun sonuna bir nokta ekleniyor
   action_cancelchanges: "iptal ediliyor:"
+  action_changeway: yolun değişiklikleri
+  action_createparallel: Yolunun paraleli oluştur
   action_createpoi: POI oluşturuluyor
   action_deletepoint: bir nokta siliniyor
   action_insertnode: yola bir nokta ekleniyor
@@ -17,16 +20,24 @@ tr:
   action_pointtags: noktadaki etiketler ayarlanıyor
   action_poitags: POI'nin etiketleri ayarlanıyor
   action_reverseway: yol tersine çevriliyor
+  action_revertway: yol geri dönülüyor
   action_splitway: yol bölünüyor
   action_waytags: yoldaki etiketler ayarlanıyor
   advanced: Gelişmiş
   advanced_close: Değişiklik takımı kapat
   advanced_history: Yolun geçmişi
+  advanced_inspector: Ayrıntı
   advanced_maximise: Ekranı kapla
+  advanced_minimise: Simge durumuna küçült
   advanced_parallel: Paralel yolu
+  advanced_tooltip: Gelişmiş düzenleme işlemleri
   advanced_undelete: "Geri al: sil"
   advice_conflict: Sununcu ile çakışması - belki bir daha kaydetmen lazım
+  advice_deletingpoi: POI siliniyor (Ger almak için Z)
+  advice_deletingway: Yol siliniyor (geri almak için Z)
   advice_nocommonpoint: Yolların ortak noktası yok
+  advice_revertingpoi: POI son kaydedilen şekline dönülüyor (geri almak için Z)
+  advice_revertingway: Yol son kaydedilen şekline geri dönülüyor (geri almak için Z)
   advice_tagconflict: Etiketler eşleşmiyor - lütfen kontrol et
   advice_toolong: Kilidi kaldırmak için yol fazla uzun - lütfen önce daha kısa yollara ayır
   advice_uploadempty: Gönderilecek hiç bir şey yok
@@ -34,25 +45,35 @@ tr:
   advice_uploadsuccess: Bütü veri başarıyla gönderildi
   advice_waydragged: Yol taşındı (geri almak için Z'ye bas)
   cancel: Vazgeç
+  closechangeset: Değişiklik takımı kapatıyor
   conflict_download: Onların sürümünü getir
   conflict_overwrite: Öbür sürümünün üzerinde yaz
   conflict_poichanged: Senin düzenlemenin başladıktan sonra başka birisi nokta $1$2 değiştirmiş.
+  conflict_relchanged: Senin düzenlemenin başladıktan sonra başka birisi ilişki $1$2 değiştirmiş.
   createrelation: Yeni bir ilişki yarat
+  custom: "Özel:"
   delete: Sil
   deleting: siliniyor
   drag_pois: POI'leri sürükle-bırak
   editinglive: Canlı düzenleniyor
   editingoffline: Çevrimdışı düzenleniyor
   emailauthor: \n\nLütfen bu hata konusunda richard\@systemeD.net'e bir e.posta at
+  error_anonymous: Anonim haritacılarla iletişime geçemezsin.
   error_connectionfailed: Maalesef OpenStreetMap sunucusuyla bağlantı koptu. Son değişiklikler kaydedilmedi.\n\nBir daha denemek ister misin?
+  error_microblog_long: "$1 yüklenme başarsız oldu:\nHTTP kodu: $2\nHata mesajı: $3\n$1 hata: $4"
   error_nopoi: POI bulunamadı (belki başka bir yere taşıdınız), bundan dolayı geri alamıyorum.
   error_nosharedpoint: $1 ve $2 yollarının paylaştıkları ortak bir nokta artık yok, bu yüzden bölmeyi geri alamıyorum.
   error_noway: $1 yolu bulunamıyor (belki atıdı) bu yüzden geri alamıyorum.
   existingrelation: Mevcut bir ilişkiye ekle
   findrelation: İçeren bir ilişki bul
   gpxpleasewait: GPX izi işlenirken lütfen biraz bekleyin
+  heading_drawing: Çizim
   heading_introduction: Tanıtım
+  heading_pois: Başlarken
   heading_quickref: Lejant
+  heading_surveying: Arazi etüdü
+  heading_tagging: Etiketlemek
+  heading_troubleshooting: Sorun giderme
   help: Yardım
   hint_drawmode: yeni nokta için tıkla\nçizgi sona ermek için\nçift tıkla/ENTER bas
   hint_latlon: "enlem $1\nboylam $2"
@@ -68,17 +89,25 @@ tr:
   inspector_locked: Kilitli
   inspector_unsaved: Kaydedilmemiş
   inspector_uploading: (yükleniyor)
+  inspector_way_connects_to: $1 yol bağlı
   inspector_way_nodes: $1 nokta
+  inspector_way_nodes_closed: $1 noktalar (kapalı)
+  loading: Yükleniyor...
   login_pwd: "Şifre:"
+  login_retry: Girişin site tarafından tanınmadı. Lütfen tekrar deneyin.
   login_title: Giriş yapılamadı
+  login_uid: "Kullanıcı adı:"
   mail: E-posta
+  more: Daha fazla
   newchangeset: "Lütfen tekrar dene: Potlatch yeni bir değişiklik takımı başlatacaktır."
   "no": Hayır
+  nobackground: Boş arka plan
   norelations: Çalışılan alanda ilişki yok
+  offset_choose: Mesafe seç (m)
   offset_dual: Çift şeritli yol (D2)
   offset_motorway: Otoyolu (D3)
   ok: Tamam
-  openchangeset: Değişiklik seti açılıyor
+  openchangeset: Değişiklik takımı açılıyor
   option_custompointers: Kalem ve el işareti kullan
   option_fadebackground: Arkaplanı saydamlaştır
   option_layer_cycle_map: OSM - Bisiklet yolu haritası
@@ -132,14 +161,17 @@ tr:
   prompt_manyways: Bu alan çok detaylı ve yüklemesi uzun sürecek. Yakınlaştıralım mı biraz?
   prompt_revertversion: "Daha önce kaydedilmiş bir sürümüne dön:"
   prompt_savechanges: Değişiklikleri kaydet
-  prompt_taggedpoints: Bu yolunun bazı noktaları etiketlenmiş ya da relasyon içinde kullanılıyor. Gerçekten silinsin mi?
+  prompt_taggedpoints: Bu yolunun bazı noktaları etiketlenmiş ya da ilişkiler içinde kullanılıyor. Gerçekten silinsin mi?
   prompt_track: GPS izini, düzenlemek için (kilitli) bir yola dönüştür.
   prompt_unlock: Kilidi açmak için tıkla
   prompt_welcome: OpenStreetMap'e Hoşgeldin!
   retry: Tekrar dene
   revert: Geri al
   save: Kaydet
+  tags_backtolist: Listeye geri dön
+  tags_findatag: Etiketi bul
   tags_findtag: Etiketi bul
+  tags_typesearchterm: "Aramak için bir sözcük yazın:"
   tip_addrelation: Bir ilişkiye ekle
   tip_addtag: Yeni etiket ekle
   tip_alert: Bir hata oluştu - ayrıntılar için tıkla
@@ -157,7 +189,14 @@ tr:
   tip_splitway: Seçtiğin noktada yolu böl (X)
   tip_tidy: Doğru çizgi oluştur (kapalı bir yoldan bir daire oluşturulacak)
   tip_undo: $1 Geri Al (Z)
+  uploading: Gönderiliyor...
+  uploading_deleting_pois: POI'ler siliniyor
   uploading_deleting_ways: Yolları siliniyor
+  uploading_poi: $1 POI yükleniyor
+  uploading_poi_name: $1, $2 POI yükleniyor
+  uploading_relation: $1 ilişki yükleniyor
+  uploading_way: $1 yol yükleniyor
+  uploading_way_name: $1, $2 yol yükleniyor
   warning: Uyarı!
   way: Yol
   "yes": Evet
index 9b4f34106dde0f2df019343ba7a0ade6ca6e8e40..450561c5d3776322f6490396b141d0eb4b24d744 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: AS
+# Author: Ahonc
 # Author: Andygol
 # Author: KEL
 # Author: Prima klasy4na
@@ -48,7 +49,7 @@ uk:
   advice_uploadfail: Завантаження даних на сервер зупинено
   advice_uploadsuccess: Всі дані успішно завантажено на сервер
   advice_waydragged: Лінію пересунуто (Z  для відміни)
-  cancel: Ð\92Ñ\96дмÑ\96на
+  cancel: Ð¡ÐºÐ°Ñ\81Ñ\83ваÑ\82и
   closechangeset: Закриття набору правок
   conflict_download: Завантажити чужу версію
   conflict_overwrite: Замінити чужі версії
index d125f1d447c5c1c2fdadb92368dbd8411b6347e9..0d81ec3ab843924cb159ff9fa244db8e4a2f4656 100644 (file)
@@ -86,7 +86,7 @@ vi:
   hint_latlon: "vđ $1\nkđ $2"
   hint_loading: đang tải các lối
   hint_overendpoint: đang trên điểm kết thúc\nnhấn chuột để nối\nshift-nhấn chuột để hợp nhất
-  hint_overpoint: đang trên điểm\nnhấn chuột để nối"
+  hint_overpoint: đang trên điểm\nnhấn chuột để nối
   hint_pointselected: đã chọn điểm\n(shift-nhấn chuột để\nbắt đầu lối mới)
   hint_saving: đang lưu dữ liệu
   hint_saving_loading: đang tải/lưu dữ liệu
index bb7d54a9c37b4888d18a821c901e8af1361ca3e9..2f97d6d943aa606301dfdc475f1cee5781d2b6b0 100644 (file)
@@ -22,13 +22,13 @@ quadtile-mysql.o: quadtile.c ${QTDIR}/quad_tile.h
        cc `mysql_config --include` -I${QTDIR} -fPIC -O3 -DUSE_MYSQL -c -o quadtile-mysql.o quadtile.c
 
 quadtile-pgsql.o: quadtile.c ${QTDIR}/quad_tile.h
-       cc -I `pg_config --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o quadtile-pgsql.o quadtile.c
+       cc -I `pg_config --includedir` -I `pg_config --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o quadtile-pgsql.o quadtile.c
 
 maptile-mysql.o: maptile.c
        cc `mysql_config --include` -fPIC -O3 -DUSE_MYSQL -c -o maptile-mysql.o maptile.c
 
 maptile-pgsql.o: maptile.c
-       cc -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o maptile-pgsql.o maptile.c
+       cc -I `pg_config --includedir` -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o maptile-pgsql.o maptile.c
 
 xid_to_int4-pgsql.o: xid_to_int4.c
-       cc -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o xid_to_int4-pgsql.o xid_to_int4.c
+       cc -I `pg_config --includedir` -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o xid_to_int4-pgsql.o xid_to_int4.c
diff --git a/db/migrate/20101114011429_add_editor_preference_to_user.rb b/db/migrate/20101114011429_add_editor_preference_to_user.rb
new file mode 100644 (file)
index 0000000..7d39cd2
--- /dev/null
@@ -0,0 +1,9 @@
+class AddEditorPreferenceToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :preferred_editor, :string
+  end
+
+  def self.down
+    remove_column :users, :preferred_editor
+  end
+end
diff --git a/lib/editors.rb b/lib/editors.rb
new file mode 100644 (file)
index 0000000..ed1de59
--- /dev/null
@@ -0,0 +1,3 @@
+module Editors 
+  ALL_EDITORS = [ "potlatch", "potlatch2", "remote" ]
+end
index 0668b8ab055c532460f0062ad22c1b8768657af9..090d4abc258398ae227f8ff99b3a130de740f438 100644 (file)
@@ -23,7 +23,8 @@ function createMap(divName, options) {
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.PanZoom(),
-         new OpenLayers.Control.PanZoomBar()
+         new OpenLayers.Control.PanZoomBar(),
+         new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
       units: "m",
       maxResolution: 156543.0339,
diff --git a/public/javascripts/menu.js b/public/javascripts/menu.js
new file mode 100644 (file)
index 0000000..9f88f0e
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * Open a menu.
+ */
+function openMenu(anchor, menu) {
+  menu.style.display = "block";
+
+  menu.clonePosition(anchor, {
+    setLeft: true, setTop: true, setWidth: false, setHeight: false,
+    offsetLeft: 0, offsetTop: anchor.getHeight()
+  });
+}
+
+/*
+ * Callback called when the mouse enters a menu anchor.
+ */
+function enterMenuAnchor(event, anchor, menu, delay) {
+  if (!anchor.hasClassName("disabled")) {
+    clearTimeout(menu.timer);
+
+    if (delay > 0) {
+      menu.timer = setTimeout(function () { openMenu(anchor, menu) }, delay);
+    } else {
+      openMenu(event, menu);
+    }
+  }
+}
+
+/*
+ * Callback called when the mouse leaves a menu anchor.
+ */
+function leaveMenuAnchor(event, anchor, menu) {
+  var to = event.relatedTarget;
+
+  if (to != menu && !to.descendantOf(menu)) {
+    menu.style.display = "none";
+  }
+
+  clearTimeout(menu.timer);
+}
+
+/*
+ * Callback called when the mouse leaves a menu.
+ */
+function leaveMenu(event, anchor, menu) {
+  var to = event.relatedTarget;
+
+  if (to != anchor && !to.descendantOf(menu)) {
+    menu.style.display = "none";
+  }
+
+  clearTimeout(menu.timer);
+}
+
+/*
+ * Setup a menu, triggered by hovering over an anchor for a given time.
+ */
+function createMenu(anchorid, menuid, delay) {
+  var anchor = $(anchorid);
+  var menu = $(menuid);
+
+  anchor.observe("mouseover", function (event) { enterMenuAnchor(anchor, anchor, menu, delay) });
+  anchor.observe("mouseout", function (event) { leaveMenuAnchor(event, anchor, menu) });
+  menu.observe("mouseout", function (event) { leaveMenu(event, anchor, menu) });
+}
index 0e2c5aeb7d12f0d69c5ac3a77b3c955cab1a2778..840617e175e8201ba3749ec15bcc048eb852214a 100644 (file)
@@ -1,4 +1,3 @@
-
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
@@ -69,15 +68,54 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     }
   }
 
+  node = $("potlatchanchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "potlatch";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
+  node = $("potlatch2anchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "potlatch2";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
+  node = $("josmanchor");
+  if (node) {
+    var args = new Object();
+    args.editor = "josm";
+    args.lat = lat;
+    args.lon = lon;
+    args.zoom = zoom;
+    if (objtype && objid) {
+      args[objtype] = objid;
+    }
+    node.href = setArgs("/edit", args);
+  }
+
   node = $("historyanchor");
   if (node) {
     if (zoom >= 11) {
       var args = new Object();
       //set bbox param from 'extents' object
       if (typeof minlon == "number" &&
-         typeof minlat == "number" &&
-         typeof maxlon == "number" &&
-         typeof maxlat == "number") {
+          typeof minlat == "number" &&
+          typeof maxlon == "number" &&
+          typeof maxlat == "number") {
 
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
@@ -216,33 +254,45 @@ function i18n(string, keys) {
   return string;
 }
 
+/*
+ * Called to interlace the bits in x and y, making a Morton code.
+ */
+function interlace(x, y) {
+    x = (x | (x << 8)) & 0x00ff00ff;
+    x = (x | (x << 4)) & 0x0f0f0f0f;
+    x = (x | (x << 2)) & 0x33333333;
+    x = (x | (x << 1)) & 0x55555555;
+
+    y = (y | (y << 8)) & 0x00ff00ff;
+    y = (y | (y << 4)) & 0x0f0f0f0f;
+    y = (y | (y << 2)) & 0x33333333;
+    y = (y | (y << 1)) & 0x55555555;
+
+    return (x << 1) | y;
+}
+
+/*
+ * Called to create a short code for the short link.
+ */
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
     var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0));
     var y = Math.round((lat +  90.0) * ((1 << 30) / 45.0));
-    // hack around the fact that JS apparently only allows 53-bit integers?!?
-    // note that, although this reduces the accuracy of the process, it's fine for
-    // z18 so we don't need to care for now.
-    var c1 = 0, c2 = 0;
-    for (var i = 31; i > 16; --i) {
-       c1 = (c1 << 1) | ((x >> i) & 1);
-       c1 = (c1 << 1) | ((y >> i) & 1);
-    }
-    for (var i = 16; i > 1; --i) {
-       c2 = (c2 << 1) | ((x >> i) & 1);
-       c2 = (c2 << 1) | ((y >> i) & 1);
-    }
+    // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+    // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
+    // and drops the last 4 bits of the full 64 bit Morton code.
     var str = "";
+    var c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff);
     for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
-       digit = (c1 >> (24 - 6 * i)) & 0x3f;
-       str += char_array.charAt(digit);
+        digit = (c1 >> (24 - 6 * i)) & 0x3f;
+        str += char_array.charAt(digit);
     }
     for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
-       digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
-       str += char_array.charAt(digit);
+        digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+        str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
-       str += "-";
+        str += "-";
     }
     return str;
 }
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/bikeshops.css b/public/potlatch2/bikeshops.css
new file mode 100644 (file)
index 0000000..cd74a7f
--- /dev/null
@@ -0,0 +1,3 @@
+node  { z-index: 9;
+            icon-image: features/bike-shop.png;
+            text-offset: 28; font-family: DejaVu; text: name; font-size: 9; text_color: red; width: 50;}
\ No newline at end of file
diff --git a/public/potlatch2/bing_maps.png b/public/potlatch2/bing_maps.png
new file mode 100644 (file)
index 0000000..bbc4b1d
Binary files /dev/null and b/public/potlatch2/bing_maps.png differ
diff --git a/public/potlatch2/bugs.css b/public/potlatch2/bugs.css
new file mode 100644 (file)
index 0000000..68bd474
--- /dev/null
@@ -0,0 +1,9 @@
+node[status=fixed] { z-index: 2;
+            icon-image: features/bugs/fixed.png; }
+
+node[status=invalid] { z-index: 2;
+            icon-image: features/bugs/invalid.png; }
+
+node[status=open]  { z-index: 2;
+            icon-image: features/bugs/open.png;
+            text-offset: 14; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
\ No newline at end of file
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/bike-shop.png b/public/potlatch2/features/bike-shop.png
new file mode 100644 (file)
index 0000000..b7a0c68
Binary files /dev/null and b/public/potlatch2/features/bike-shop.png differ
diff --git a/public/potlatch2/features/bugs/fixed.png b/public/potlatch2/features/bugs/fixed.png
new file mode 100644 (file)
index 0000000..99c265b
Binary files /dev/null and b/public/potlatch2/features/bugs/fixed.png differ
diff --git a/public/potlatch2/features/bugs/invalid.png b/public/potlatch2/features/bugs/invalid.png
new file mode 100644 (file)
index 0000000..35bddf1
Binary files /dev/null and b/public/potlatch2/features/bugs/invalid.png differ
diff --git a/public/potlatch2/features/bugs/open.png b/public/potlatch2/features/bugs/open.png
new file mode 100644 (file)
index 0000000..4432db9
Binary files /dev/null and b/public/potlatch2/features/bugs/open.png differ
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__living_street.png b/public/potlatch2/features/highway__living_street.png
new file mode 100644 (file)
index 0000000..1143ec6
Binary files /dev/null and b/public/potlatch2/features/highway__living_street.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..d57e808
Binary files /dev/null and b/public/potlatch2/features/highway__motorway.png differ
diff --git a/public/potlatch2/features/highway__motorway_link.png b/public/potlatch2/features/highway__motorway_link.png
new file mode 100644 (file)
index 0000000..db29b4b
Binary files /dev/null and b/public/potlatch2/features/highway__motorway_link.png differ
diff --git a/public/potlatch2/features/highway__primary.png b/public/potlatch2/features/highway__primary.png
new file mode 100644 (file)
index 0000000..096e695
Binary files /dev/null and b/public/potlatch2/features/highway__primary.png differ
diff --git a/public/potlatch2/features/highway__primary_link.png b/public/potlatch2/features/highway__primary_link.png
new file mode 100644 (file)
index 0000000..cf5528a
Binary files /dev/null and b/public/potlatch2/features/highway__primary_link.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..5632f52
Binary files /dev/null and b/public/potlatch2/features/highway__residential.png differ
diff --git a/public/potlatch2/features/highway__secondary.png b/public/potlatch2/features/highway__secondary.png
new file mode 100644 (file)
index 0000000..6d826c4
Binary files /dev/null and b/public/potlatch2/features/highway__secondary.png differ
diff --git a/public/potlatch2/features/highway__secondary_link.png b/public/potlatch2/features/highway__secondary_link.png
new file mode 100644 (file)
index 0000000..fd348a8
Binary files /dev/null and b/public/potlatch2/features/highway__secondary_link.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..4c35639
Binary files /dev/null and b/public/potlatch2/features/highway__service.png differ
diff --git a/public/potlatch2/features/highway__tertiary.png b/public/potlatch2/features/highway__tertiary.png
new file mode 100644 (file)
index 0000000..16daae0
Binary files /dev/null and b/public/potlatch2/features/highway__tertiary.png differ
diff --git a/public/potlatch2/features/highway__tertiary_link.png b/public/potlatch2/features/highway__tertiary_link.png
new file mode 100644 (file)
index 0000000..bc10102
Binary files /dev/null and b/public/potlatch2/features/highway__tertiary_link.png differ
diff --git a/public/potlatch2/features/highway__track.png b/public/potlatch2/features/highway__track.png
new file mode 100644 (file)
index 0000000..ce5855e
Binary files /dev/null and b/public/potlatch2/features/highway__track.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..5018b47
Binary files /dev/null and b/public/potlatch2/features/highway__trunk.png differ
diff --git a/public/potlatch2/features/highway__trunk_link.png b/public/potlatch2/features/highway__trunk_link.png
new file mode 100644 (file)
index 0000000..32a4896
Binary files /dev/null and b/public/potlatch2/features/highway__trunk_link.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..ae6ea7b
Binary files /dev/null and b/public/potlatch2/features/highway__unclassified.png differ
diff --git a/public/potlatch2/features/highway__unknown.png b/public/potlatch2/features/highway__unknown.png
new file mode 100644 (file)
index 0000000..d61d54a
Binary files /dev/null and b/public/potlatch2/features/highway__unknown.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..0d9c012
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..94772d0
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..c7c476e
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..3ad7549
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..e32cfd8
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..8f04ccd
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__drain.png b/public/potlatch2/features/waterway__drain.png
new file mode 100644 (file)
index 0000000..6351862
Binary files /dev/null and b/public/potlatch2/features/waterway__drain.png differ
diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png
new file mode 100644 (file)
index 0000000..79f7256
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__slipway.png b/public/potlatch2/features/waterway__slipway.png
new file mode 100644 (file)
index 0000000..f50633b
Binary files /dev/null and b/public/potlatch2/features/waterway__slipway.png differ
diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png
new file mode 100644 (file)
index 0000000..888956e
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/features/waterway__weir.png b/public/potlatch2/features/waterway__weir.png
new file mode 100644 (file)
index 0000000..3b12080
Binary files /dev/null and b/public/potlatch2/features/waterway__weir.png differ
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..72f6146
--- /dev/null
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<imagery>
+       <set>
+               <name>Bing</name>
+               <url>http://ecn.t0.tiles.virtualearth.net/tiles/a$quadkey.jpeg?g=587&mkt=en-gb&n=z</url>
+               <scheme>microsoft</scheme>
+               <sourcetag>Bing</sourcetag>
+               <attribution_url>http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key=Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU&include=ImageryProviders&output=xml</attribution_url>
+               <logo>bing_maps.png</logo>
+               <logo_url>http://www.bing.com/maps</logo_url>
+               <terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
+               <default>yes</default>
+       </set>
+       <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 minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
+               <name>OS OpenData Streetview</name>
+               <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
+               <sourcetag>OS OpenData StreetView</sourcetag>
+       </set>
+       <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
+               <name>OS OpenData Locator</name>
+               <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
+               <sourcetag>OS OpenData Locator</sourcetag>
+       </set>
+       <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
+               <name>OS 1:25k historic</name>
+               <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url>
+               <sourcetag>OS 1:25k</sourcetag>
+       </set>
+       <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
+               <name>OS 7th Series historic</name>
+               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
+               <sourcetag>OS7</sourcetag>
+       </set>
+       <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
+               <name>OS New Popular Edition historic</name>
+               <url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url>
+               <sourcetag>NPE</sourcetag>
+       </set>
+       <set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
+               <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 minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
+               <name>Surrey aerial</name>
+               <url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url>
+               <sourcetag>Surrey aerial</sourcetag>
+       </set>
+       <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
+               <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 minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
+               <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 minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
+               <name>Haiti - DigitalGlobe</name>
+               <url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url>
+               <sourcetag>Haiti DigitalGlobe</sourcetag>
+       </set>
+       <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
+               <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..17845f6
--- /dev/null
@@ -0,0 +1,3404 @@
+<?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="Places" id="places">
+  </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">
+    <input type="freetext" category="Misc" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
+  </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>
+
+  <inputSet id="places">
+    <input type="choice" name="Type of Place" 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="town" text="Town"/>
+      <choice value="city" text="City"/>
+      <choice value="county" text="County"/>
+      <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>
+
+  <!-- ************************************************************************
+       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">
+    <category>roads</category>
+    <icon image="features/highway__motorway_link.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">
+    <category>roads</category>
+    <icon image="features/highway__trunk_link.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__primary.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 link">
+    <category>roads</category>
+    <icon image="features/highway__primary_link.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__secondary.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 link">
+    <category>roads</category>
+    <icon image="features/highway__secondary_link.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__tertiary.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 link">
+    <category>roads</category>
+    <icon image="features/highway__tertiary_link.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__unknown.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__living_street.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__track.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/waterway__drain.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/waterway__weir.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/waterway__slipway.png" />
+    <line/>
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Slipway">
+    <category>water</category>
+    <point />
+    <tag k="leisure" v="slipway"/>
+    <inputSet ref="names"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Coastline">
+    <category>water</category>
+    <line/>
+    <tag k="natural" v="coastline"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <!-- ************************************************************************
+       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="*"/> -->
+    <tag k="building" v="yes"/>
+    <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="Industrial Area">
+    <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 Area">
+    <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 Area">
+    <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="Construction Site">
+    <category>landuse</category>
+    <area/>
+    <icon image="features/pois/building_generic.png">
+      <b>${name}</b>
+    </icon>
+    <tag k="landuse" v="construction"/>
+    <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="Hamlet">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="hamlet" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Village">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="village" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Suburb">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="suburb" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="Town">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="town" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <inputSet ref="common"/>
+  </feature>
+
+  <feature name="City">
+    <category>places</category>
+    <icon image="icons/place.png"/>
+    <point/>
+    <area/>
+    <tag k="place" v="city" />
+    <inputSet ref="names"/>
+    <inputSet ref="places"/>
+    <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>
+
+  <feature name="Toilets">
+    <category>amenity</category>
+    <point/>
+    <tag k="amenity" v="toilets"/>
+    <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="Mini Roundabout">
+    <category>transport</category>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout</help>
+    <point/>
+    <tag k="highway" v="mini_roundabout"/>
+    <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="*"/>-->
+    <tag k="traffic_calming" v="yes"/>
+    <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>
+
+  <!-- boundaries -->
+
+  <feature name="Administrative Boundary">
+    <category>places</category>
+    <line/>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
+    <tag k="boundary" v="administrative"/>
+    <input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
+  </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" name="Network" key="network" description="The network of the tram service" priority="low"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+
+  <!-- Junction nodes (for turn restrictions) -->
+
+  <feature>
+    <point/>
+    <within entity="way" k="highway" minimum="2"/>
+    <inputSet ref="junctionNode"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
+</mapFeatures>
diff --git a/public/potlatch2/opencyclemap.css b/public/potlatch2/opencyclemap.css
new file mode 100644 (file)
index 0000000..25d7fe1
--- /dev/null
@@ -0,0 +1,160 @@
+/*
+
+       Stylesheet that mimicks, to a certain extent, opencyclemap
+        Andy Allan, June 2010
+
+       Based heavily on:
+       MapCSS demonstration stylesheet
+       Richard Fairhurst, October 2009
+       
+*/
+
+/* This rule applies to all areas (closed ways). Note that rules are applied in the order
+  they appear in the file, so later rules may replace this one for some ways.
+  This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since
+  it picks up closed-loop highways. */
+
+way :area { color: grey; width: 1; fill-color: red; fill-opacity: 0.1; }
+
+/* A set of fairly standard rules.
+  We use z-index to make sure high-priority roads appear above minor ones.
+  The default z-index is 5. If an object matches multiple rules with the same
+  z-index then the rules are "merged" (but individual properties become one or the other)  */
+
+/*way[highway=motorway],way[highway=motorway_link],
+way[highway=trunk],way[highway=trunk_link],
+way[highway=primary],way[highway=primary_link],
+way[highway=secondary],way[highway=secondary_link],
+way[highway=tertiary],way[highway=tertiary_link],
+way[highway=residential]                             { text: name; text-color: black; font-size: 7; text-position: line;}*/
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 9; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 9; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 9; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 9; }
+way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 7; }
+way[highway=residential]                            { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 7; }
+way[highway=service]                                { color: white; width: 3; casing-color: #999; casing-width: 5; }
+
+/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
+area=yes tag should be filled. The below doesn't yet work as intended. */
+way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; }
+way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
+
+way[highway=steps]     { color: #be6c6c; width: 2; dashes: 4, 2; }
+way[highway=footway]   { color: #be6c6c; width: 2; dashes: 6, 3; }
+way[highway=cycleway]  { color: blue; width: 1.6; dashes: 5, 4; }
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; }
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; }
+way[highway=path]      { color: lightgreen; width: 2; dashes: 2, 2; }
+
+way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
+
+way[barrier] {color: #000000; width: 1}
+
+/* Fills can be solid colour or bitmap images */
+
+
+way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
+way[landuse] :area                          { color: #efefef; width: 1; fill-color: #f5f5f5; fill-opacity: 0.3; }
+way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
+way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; }
+way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; }
+way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; }
+way[building] :area                         { color: #8d8d8d; width: 1; fill-color: #e0e0e0; fill-opacity: 0.2; }
+way[natural=water],
+way[waterway] :area               { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; }
+way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; }
+way[leisure=pitch],way[leisure=park]        { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; }
+way[amenity=parking] :area                  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.2; }
+way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
+
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
+
+node[addr:housenumber],
+node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
+
+/* POIs, too, can have bitmap icons - they can even be transparent */
+
+node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; }
+/*node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; }
+node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; }
+node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; }
+node[amenity=atm] { icon-image: icons/atm.png; }
+node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; }
+node[highway=bus_stop] { icon-image: icons/bus_stop.png; }
+node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; }
+node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; }
+node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; }
+node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; }
+node[amenity=fire_station] { icon-image: icons/fire_station.png; }
+node[amenity=hospital] { icon-image: icons/hospital.png; }
+node[tourism=hotel] { icon-image: icons/hotel.png; }
+node[amenity=parking] { icon-image: icons/parking.png; } */
+node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; text-color: blue }
+/* node[amenity=pharmacy] { icon-image: icons/pharmacy.png; }
+node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; }
+node[amenity=police] { icon-image: icons/police.png; }
+node[amenity=post_box] { icon-image: icons/post_box.png; }
+node[amenity=recycling] { icon-image: icons/recycling.png; }
+node[amenity=restaurant] { icon-image: icons/restaurant.png; }
+node[amenity=school] { icon-image: icons/school.png; }
+node[amenity=taxi] { icon-image: icons/taxi.png; }
+node[amenity=telephone] { icon-image: icons/telephone.png; }
+way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
+way node[barrier=bollard] { icon-image: icons/bollard.png; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/
+       
+/* We can stack styles at different z-index (depth) */
+
+way[railway=rail]
+       { z-index: 6; color: #444444; width: 5; } 
+       { z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=platform] { color:black; width: 2; }
+way[railway=subway]
+        { z-index: 6; color: #444444; width: 5; }
+        { z-index: 7; color: white; width: 3; dashes: 8,8; }
+
+/* Bridge */
+way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
+    { z-index: 4; color: white; width: eval('_width+3'); }
+    { z-index: 3; color: black; width: eval('_width+6'); }
+    
+/* Tunnel */
+way[tunnel=yes]
+    { z-index: 4; color: white; width: eval('_width+2'); }
+    { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
+
+/* Oneway */
+way[oneway=yes] { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; }
+
+
+/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */
+
+way .highlighted { color: pink; }
+
+/* Interactive editors may choose different behaviour when a user mouses-over or selects
+   an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */
+
+way :hover     { z-index: 2; width: eval('_width+10'); color: #ffff99; }
+way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
+way !:drawn { z-index:10; width: 0.5; color: gray; } 
+
+node :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1;}
+node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; }
+node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 3; color: lightsteelblue; casing-color: black; casing-width: 1; }
+node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; }
+node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; }
+       
+/* Descendant selectors provide an easy way to style relations: this example means "any way
+   which is part of a relation whose type=route". */
+
+relation[type=route] way { z-index: 1; width: 17; color: yellow; opacity: 0.3; }
+relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
+relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
+relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
+relation[type=route][route=bicycle][network=mtb] way { z-index: 1; width: 12; color: #48a448; opacity: 0.3; }
+
+
+
diff --git a/public/potlatch2/potlatch.css b/public/potlatch2/potlatch.css
new file mode 100644 (file)
index 0000000..f51fdd1
--- /dev/null
@@ -0,0 +1,281 @@
+/*
+
+       Stylesheet that mimicks, to a certain extent, potlatch 1.x
+        Started by Andy Allan, November 2009
+
+       Based heavily on:
+       MapCSS demonstration stylesheet
+       Richard Fairhurst, October 2009
+
+*/
+
+/* This rule applies to all areas (closed ways). Note that rules are applied in the order
+  they appear in the file, so later rules may replace this one for some ways.
+  This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since
+  it picks up closed-loop highways. */
+
+/* way :area { color: red; width: 1; fill-color: red; fill-opacity: 0.5; } */
+
+/* A set of fairly standard rules.
+  We use z-index to make sure high-priority roads appear above minor ones.
+  The default z-index is 5. If an object matches multiple rules with the same
+  z-index then the rules are "merged" (but individual properties become one or the other)  */
+
+way[highway=motorway],way[highway=motorway_link],
+way[highway=trunk],way[highway=trunk_link],
+way[highway=primary],way[highway=primary_link],
+way[highway=secondary],way[highway=secondary_link],
+way[highway=tertiary],way[highway=tertiary_link],
+way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 8; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 8; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 8; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 8; }
+way[highway=tertiary],way[highway=unclassified]     { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; }
+way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 5; }
+way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 7; }
+way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 5; }
+way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 2; }
+way[highway=service][service=alley]                 { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 4; }
+way[highway=road]                                   { color: gray; width: 5; casing-color: white; casing-width: 7; }
+
+/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit
+area=yes tag should be filled. The below doesn't yet work as intended. */
+way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
+way[highway=pedestrian] :area  { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
+
+way[highway=steps]     { color: #FF6644; width: 6; dashes: 2, 2; }
+way[highway=footway]   { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
+way[highway=footway][bicycle=yes]   { z-index: 4; color: Blue; width: 1; }
+way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;}
+way[highway=track]     { color: #996644; width: 2; dashes: 4, 2; .path;}
+way[highway=path]      { color: brown; width: 2; dashes: 2, 2; set .path;}
+way[highway=cycleway]  { color: Blue; width: 2; dashes: 4, 2; set .path;}
+way[railway=tram]      {z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 6; }
+way .path              {text:name; text-color: black; text-position: offset; text-offset: 5;}
+
+/* Could be improved */
+way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }
+way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 8; casing-dashes: 8,4;}
+way[construction=rail] 
+       { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
+       { z-index: 7; color: white; width: 3; dashes: 6,18; }
+
+       
+
+way[waterway=river], 
+way[waterway=canal], 
+way[waterway=stream]   { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
+way[waterway=drain]                     {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway][tunnel=yes]                {dashes: 8,4;}
+
+way[barrier] {color: #000000; width: 1}
+way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; }
+
+/*add node[power=pylon] etc when there's an icon */
+way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 8; casing-dashes: 4, 38;}
+way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 8; casing-color: white; casing-dashes: 2,22;}
+way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;}
+way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;}
+
+way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 10; }
+
+/* Fills can be solid colour or bitmap images */
+
+
+way[natural] :area                          { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; }
+way[natural=beach] :area                    { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;}
+way[natural=coastline]                                         { color: black; width: 3; }
+way[landuse] :area                          { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; }
+way[landuse=residential] :area              { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; }
+way[landuse=retail] :area                   { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; }
+way[landuse=commercial] :area               { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
+way[landuse=military] :area                 { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
+way[amenity],way[shop] :area                { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
+way[leisure],way[sport] :area               { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
+way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
+way[historic],way[ruins] :area              { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
+way[military] :area                         { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
+way[building] :area                         { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }
+way[natural=water],
+way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[waterway=dam]                                                      { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
+way[man_made] :area                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
+way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
+way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
+way[leisure=pitch] :area                                       { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;}
+way[landuse=recreation_ground] :area        { color: green; fill-color: green; set .area_small_name;}
+way[amenity=parking] :area                  { color: #bbaa66;    width: 1; fill-color: #bbaa66;    fill-opacity: 0.2; }
+way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-color: gray;    fill-opacity: 0.1; }
+
+way[man_made=pier]                                                     { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 5;}
+way[man_made=pier][floating=yes]                       { dashes: 4,2; casing-color: #444;}
+way[leisure=marina] :area                                      { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
+way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 7; }
+way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
+
+way[boundary=administrative]                { color: purple; width: 2; opacity: 0.2; dashes: 24,4; }
+way[landuse=cemetery]                                          { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
+/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */
+
+node[addr:housenumber],
+node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
+
+/* POIs, too, can have bitmap icons - they can even be transparent */
+node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
+node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
+
+node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; }
+node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
+node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
+node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
+node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
+node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
+node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
+node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; }
+node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; }
+node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; }
+node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; }
+node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; }
+node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; }
+node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; }
+node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; }
+node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
+node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
+node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
+node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
+way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
+node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
+node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
+node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
+node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
+node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; }
+node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
+node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
+node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; }
+node[shop=book] { icon-image: icons/shopping_book.n.16.png; z-index: 20; }
+node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; }
+node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; }
+node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
+node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
+node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
+node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
+node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
+node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; }
+node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; }
+node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; }
+node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; }
+node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; }
+node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; }
+node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; }
+node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; }
+node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
+node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
+node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
+node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
+node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
+node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
+node[historic=ruin] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
+node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
+node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; }
+node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; }
+node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; }
+node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; }
+node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
+node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
+node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
+node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
+node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
+node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
+node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
+node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
+node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
+node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
+
+way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; }
+
+
+/* We can stack styles at different z-index (depth) */
+
+way[railway=rail]
+       { z-index: 6; color: black; width: 5; }
+       { z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=platform] { color:black; width: 2; }
+way[railway=subway]
+        { z-index: 6; color: #444444; width: 5; }
+        { z-index: 7; color: white; width: 3; dashes: 8,8; }
+
+/* Bridge */
+way[bridge=yes], way[bridge=viaduct], way[bridge=suspension]
+    { z-index: 4; color: white; width: eval('_width+3'); }
+    { z-index: 3; color: black; width: eval('_width+6'); }
+
+/* Tunnel */
+way[tunnel=yes][!waterway]
+    { z-index: 4; color: white; width: eval('_width+2'); }
+    { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
+
+way[embankment=yes], way[cutting=yes]
+    { z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
+
+/* Oneway */
+way[oneway=yes] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
+
+way[access=private],way[access=no] { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;}
+way[access=permissive] { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;}
+
+way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */
+
+way .highlighted { color: pink; }
+
+/* Interactive editors may choose different behaviour when a user mouses-over or selects
+   an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */
+
+way :hover     { z-index: 2; width: eval('_width+10'); color: #ffff99; }
+way :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;}
+way :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;}
+way :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;}
+/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/
+way !:drawn { z-index:10; width: 1; color: #333333; }
+way :tiger { casing-color: #ff00ff;}
+
+
+relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; }
+
+node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
+node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
+node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
+node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
+node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
+node :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
+node :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
+
+/* Descendant selectors provide an easy way to style relations: this example means "any way
+   which is part of a relation whose type=route". */
+
+relation[type=route] way { z-index: 1; width: 13; color: blue; opacity: 0.3; }
+relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; }
+relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; }
+relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; }
+relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; }
+
+
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
new file mode 100644 (file)
index 0000000..37a0857
Binary files /dev/null and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets.xml b/public/potlatch2/stylesheets.xml
new file mode 100644 (file)
index 0000000..c9abed1
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<stylesheets>
+       <stylesheet>
+               <name>Potlatch</name>
+               <url>potlatch.css</url>
+       </stylesheet>
+       <stylesheet>
+               <name>Wireframe</name>
+               <url>wireframe.css</url>
+       </stylesheet>
+    <stylesheet>
+        <name>OpenCycleMap</name>
+        <url>opencyclemap.css</url>
+    </stylesheet>
+    <stylesheet>
+        <name>GPS</name>
+        <url>gpx.css</url>
+    </stylesheet>
+    <stylesheet>
+        <name>Bugs</name>
+        <url>bugs.css</url>
+    </stylesheet>
+</stylesheets>
diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml
new file mode 100644 (file)
index 0000000..5fef714
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<vectors>
+    <set loaded="true">
+      <name>Mapdust Bugs</name>
+      <loader>BugLoader</loader>
+      <url>http://www.mapdust.com/api/</url>
+      <details>http://www.mapdust.com/detail/</details>
+      <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
+    </set>
+    <set>
+      <name>Bike Shop Locator - Missing Shops</name>
+      <loader>BikeShopLoader</loader>
+      <url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url>
+    </set>
+    <set>
+      <name>Everyone's GPS tracks</name>
+      <loader>TrackLoader</loader>
+      <!-- doesn't need a URL -->
+    </set>
+    <set disabled="true">
+      <name>A particular GPX file</name>
+      <loader>GPXImporter</loader>
+      <policyfile>http://gravitystorm.dev.openstreetmap.org/gpx/crossdomain.xml</policyfile>
+      <url>http://gravitystorm.dev.openstreetmap.org/gpx/112.gpx</url>
+    </set>
+</vectors>
\ No newline at end of file
diff --git a/public/potlatch2/wireframe.css b/public/potlatch2/wireframe.css
new file mode 100644 (file)
index 0000000..e2ac883
--- /dev/null
@@ -0,0 +1,15 @@
+/*
+
+       Stylesheet that does simple wireframe display
+       
+*/
+
+way :hover     { z-index: 2; width: 1; color: blue; }
+way :selected { z-index: 2; width: 1; color: red; }
+way !:drawn { z-index:10; width: 1; color: black; } 
+
+node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green; }
+node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; }
+node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; }
+node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
+
index 36966f3bae46a07401a05d1f8323960991fc9402..fde9fde86808c9042621b89e0aa99e2dbfa1cfc2 100644 (file)
@@ -344,6 +344,27 @@ hr {
   text-align: right;
 }
 
+/* Rules for edit menu */
+
+#editmenu {
+  display: none;
+  z-index: 10000;
+  position: absolute;
+  background-color: #ffffff;
+  border: 1px solid black;
+}
+
+#editmenu ul {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+#editmenu li {
+  list-style-type: none;
+}
+
 /* Rules for attribution text under the main map shown on printouts */
 
 #attribution {
index 7d8c1a95648bf971adaada3437182d4b7f9736fe..f1300257c3350146c98154acf57ae9f67277beeb 100644 (file)
   display: none;
 }
 
+#editmenu {
+  display: none;
+}
+
 .olControlPanZoom {
   display: none;
 }
   display: none;
 }
 
+.olControlScaleLine {
+  display: none !important;
+}
+
 .olControlAttribution {
   display: none !important;
 }
index c388870ad21a305163d0fe4af5988dff5a7b93bb..1b020380d13243e574ab40df2fb8e9fc3cd32c2d 100644 (file)
@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase
-  ## Lets check that we can get all the pages without any errors
-  
+  fixtures :users
+
+  ## Lets check that we can get all the pages without any errors  
   # Get the index
   def test_index
     get :index
@@ -39,4 +40,30 @@ class SiteControllerTest < ActionController::TestCase
     assert_template :partial => '_key', :count => count
     assert_template :partial => '_sidebar', :count => count
   end
+
+  # test the right editor gets used when the user hasn't set a preference
+  def test_edit_without_preference
+    get(:edit, nil, { 'user' => users(:public_user).id })
+    assert_response :success
+    assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
+  end
+
+  # and when they have...
+  def test_edit_with_preference
+    user = users(:public_user)
+    user.preferred_editor = "potlatch"
+    user.save!
+
+    get(:edit, nil, { 'user' => user.id })
+    assert_response :success
+    assert_template :partial => "_potlatch", :count => 1
+
+    user = users(:public_user)
+    user.preferred_editor = "remote"
+    user.save!
+
+    get(:edit, nil, { 'user' => user.id })
+    assert_response :success
+    assert_template "index"
+  end    
 end
index ac2bd5e7145997613879b21d3cf1dbc5439c761c..7d5f8dced28c50bc9f37560cfeac4abf59edfd32 100644 (file)
@@ -138,4 +138,15 @@ class UserTest < ActiveSupport::TestCase
     #Friend.delete(friend)
     #assert_equal 0, Friend.count
   end
+
+  def test_user_preferred_editor
+    user = users(:normal_user)
+    assert_equal nil, user.preferred_editor
+    user.preferred_editor = "potlatch"
+    assert_equal "potlatch", user.preferred_editor
+    user.save!
+
+    user.preferred_editor = "invalid_editor"
+    assert_raise(ActiveRecord::RecordInvalid) { user.save! }
+  end
 end