diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb new file mode 100644 index 0000000000..705b9139c2 --- /dev/null +++ b/app/views/site/_potlatch2.html.erb @@ -0,0 +1,36 @@ +
+ <%= t 'site.edit.flash_player_required' %> +
+ +<%= javascript_include_tag 'swfobject.js' %> + diff --git a/config/locales/en.yml b/config/locales/en.yml index d5c82a7a27..cfaa07bf1a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1659,8 +1659,9 @@ en: flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." editor: - potlatch: "Potlatch (in-browser editor)" - josm: "JOSM (via remote-control plugin)" + potlatch: "Potlatch 1 (in-browser editor)" + potlatch2: "Potlatch 2 (in-browser editor)" + josm: "JOSM (via remote-control plugin)" confirm: heading: Confirm a user account press confirm button: "Press the confirm button below to activate your account." diff --git a/lib/editors.rb b/lib/editors.rb index e3e17e5353..efd10aef96 100644 --- a/lib/editors.rb +++ b/lib/editors.rb @@ -1,3 +1,3 @@ module Editors - ALL_EDITORS = [ "potlatch", "josm" ] + ALL_EDITORS = [ "potlatch", "potlatch2", "josm" ] end diff --git a/public/potlatch2/FontLibrary.swf b/public/potlatch2/FontLibrary.swf new file mode 100644 index 0000000000..104c8c9509 Binary files /dev/null and b/public/potlatch2/FontLibrary.swf differ diff --git a/public/potlatch2/features/barrier_generic.png b/public/potlatch2/features/barrier_generic.png new file mode 100644 index 0000000000..fe72ab4084 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 index 0000000000..eaefcb155e --- /dev/null +++ b/public/potlatch2/features/barrier_generic.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/public/potlatch2/features/cycle__lcn.png b/public/potlatch2/features/cycle__lcn.png new file mode 100644 index 0000000000..b46ab059be 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 index 0000000000..49456c48fb 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 index 0000000000..ed79223bc5 Binary files /dev/null and b/public/potlatch2/features/cycle__rcn.png differ diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png new file mode 100644 index 0000000000..0a12e18751 Binary files /dev/null and b/public/potlatch2/features/highway__motorway.png differ diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png new file mode 100644 index 0000000000..d481aab752 Binary files /dev/null and b/public/potlatch2/features/highway__residential.png differ diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png new file mode 100644 index 0000000000..0fdd441359 Binary files /dev/null and b/public/potlatch2/features/highway__service.png differ diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png new file mode 100644 index 0000000000..b8e1e0b068 Binary files /dev/null and b/public/potlatch2/features/highway__trunk.png differ diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png new file mode 100644 index 0000000000..9359af261c Binary files /dev/null and b/public/potlatch2/features/highway__unclassified.png differ diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png new file mode 100644 index 0000000000..2a80e9f3e7 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 index 0000000000..b768ab05c6 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 index 0000000000..e62054cbf8 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 index 0000000000..75d98bed13 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 index 0000000000..a2224821f5 --- /dev/null +++ b/public/potlatch2/features/paths__bike.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png new file mode 100644 index 0000000000..79b3874e81 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 index 0000000000..8688699f9e --- /dev/null +++ b/public/potlatch2/features/paths__bridleway.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/public/potlatch2/features/paths__footway.png b/public/potlatch2/features/paths__footway.png new file mode 100644 index 0000000000..082cfffeaf 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 index 0000000000..b218d1a06e --- /dev/null +++ b/public/potlatch2/features/paths__footway.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/public/potlatch2/features/paths__pedestrian.png b/public/potlatch2/features/paths__pedestrian.png new file mode 100644 index 0000000000..7348ed9901 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 index 0000000000..55ce9d60ac --- /dev/null +++ b/public/potlatch2/features/paths__pedestrian.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/public/potlatch2/features/paths__steps.png b/public/potlatch2/features/paths__steps.png new file mode 100644 index 0000000000..1590b29ce4 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 index 0000000000..ebbe95667f --- /dev/null +++ b/public/potlatch2/features/paths__steps.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/public/potlatch2/features/paths__unknown.png b/public/potlatch2/features/paths__unknown.png new file mode 100644 index 0000000000..b050bc38b0 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 index 0000000000..32831691e8 --- /dev/null +++ b/public/potlatch2/features/paths__unknown.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + 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 index 0000000000..2a6ec573ae 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 index 0000000000..e40e3d80e9 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 index 0000000000..926bd4a406 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 index 0000000000..6a0c952d28 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 index 0000000000..57d531ed44 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 index 0000000000..129a44c6d7 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 index 0000000000..d7a85b777d 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 index 0000000000..13f18df6dd 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 index 0000000000..443189fbad 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 index 0000000000..c7fddf7bc7 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 index 0000000000..a9d6566f82 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 index 0000000000..4b5eb86afe 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 index 0000000000..d608f7d7f6 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 index 0000000000..b6671478bc 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 index 0000000000..3000661f97 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 index 0000000000..102da89843 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 index 0000000000..474efd6bae 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 index 0000000000..0c18c5edd2 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 index 0000000000..a57de177e5 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 index 0000000000..2473955dfb --- /dev/null +++ b/public/potlatch2/features/pois/barrier_generic.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + 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 index 0000000000..a2c3e55b8c 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 index 0000000000..a41a3679ea 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 index 0000000000..9e04ae23d0 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 index 0000000000..302492adad 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 index 0000000000..669fb027f1 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 index 0000000000..40abf2b68c 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 index 0000000000..62936341d6 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 index 0000000000..a63a09d4db 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 index 0000000000..9e9b3173e5 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 index 0000000000..96f5e77060 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 index 0000000000..714914f7ad 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 index 0000000000..e7813ea2a6 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 index 0000000000..e9b114a71d 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 index 0000000000..4fe2fc7d0b 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 index 0000000000..f65bde37ef 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 index 0000000000..e081dd5212 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 index 0000000000..873adc71e4 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 index 0000000000..2f91691669 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 index 0000000000..3bcc77a00c 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 index 0000000000..57c6d9435e 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 index 0000000000..c22cc3b670 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 index 0000000000..f588a198a3 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 index 0000000000..dce1d15d4a 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 index 0000000000..51441eaeb8 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 index 0000000000..8efbb3f0fa 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 index 0000000000..cefb9124ab 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 index 0000000000..6abdcb7f04 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 index 0000000000..e5c7089d18 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 index 0000000000..2e1dbaef76 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 index 0000000000..7a35633916 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 index 0000000000..c8236cba90 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 index 0000000000..fe5eccee6f 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 index 0000000000..416247f30a 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 index 0000000000..a81617805e 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 index 0000000000..ad402d5500 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 index 0000000000..e844989fd1 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 index 0000000000..66ec0b9503 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 index 0000000000..c3e8a519fc 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 index 0000000000..55a0ca2e18 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 index 0000000000..cf4248f332 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 index 0000000000..17df5c5635 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 index 0000000000..fd25846867 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 index 0000000000..ad42a4e519 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 index 0000000000..dd6d636c8b 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 index 0000000000..a75a358bd8 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 index 0000000000..5cd89b60b1 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 index 0000000000..2f849d85f1 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 index 0000000000..b502bfc7bc 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 index 0000000000..75734d6780 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 index 0000000000..4207e84275 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 index 0000000000..2729e68dee 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 index 0000000000..853632b0b3 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 index 0000000000..3cdea51d55 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 index 0000000000..6943ab48e6 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 index 0000000000..d8650c1fc6 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 index 0000000000..a5db00bd63 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 index 0000000000..733f03f4d3 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 index 0000000000..a2dde9ebb6 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 index 0000000000..f33b9d861e 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 index 0000000000..83b7eccf1f 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 index 0000000000..455a311df4 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 index 0000000000..33bbd54502 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 index 0000000000..e9cdc7e137 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 index 0000000000..d81484abdb 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 index 0000000000..736e943b71 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 index 0000000000..5024e3e820 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 index 0000000000..42f2e54c13 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 index 0000000000..6aa900cb91 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 index 0000000000..6e5f6e19dd 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 index 0000000000..773ac431a9 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 index 0000000000..5570e708c7 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 index 0000000000..8fd3073458 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 index 0000000000..6e1cb10a95 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 index 0000000000..edf5348458 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 index 0000000000..47736bc342 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 index 0000000000..c04dd77d0f 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 index 0000000000..fcfbc24d2d --- /dev/null +++ b/public/potlatch2/features/pois/water_generic.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/public/potlatch2/features/power_high.png b/public/potlatch2/features/power_high.png new file mode 100644 index 0000000000..c8b102d493 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 index 0000000000..619562fd72 --- /dev/null +++ b/public/potlatch2/features/power_high.svg @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/features/power_low.png b/public/potlatch2/features/power_low.png new file mode 100644 index 0000000000..e45f405c19 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 index 0000000000..0cec276c0c --- /dev/null +++ b/public/potlatch2/features/power_low.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/public/potlatch2/features/restriction__no_left_turn.png b/public/potlatch2/features/restriction__no_left_turn.png new file mode 100644 index 0000000000..9d1695291b 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 index 0000000000..1cd51f03e4 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 index 0000000000..9cc66283a6 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 index 0000000000..2dba9bb0fc 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 index 0000000000..0c71faf5b9 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 index 0000000000..d4ed162587 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 index 0000000000..d62b11193a 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 index 0000000000..b779706f56 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 index 0000000000..e50b18693a 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 index 0000000000..efd37fea1c --- /dev/null +++ b/public/potlatch2/features/transport__railway.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/public/potlatch2/features/transport__railway_abandoned.png b/public/potlatch2/features/transport__railway_abandoned.png new file mode 100644 index 0000000000..81717b82d3 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 index 0000000000..347b1c330f 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 index 0000000000..f1a5628ece 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 index 0000000000..2989d3e697 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 index 0000000000..4dcd213eac --- /dev/null +++ b/public/potlatch2/features/transport__subway.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/public/potlatch2/features/transport__tram.png b/public/potlatch2/features/transport__tram.png new file mode 100644 index 0000000000..e676eab84b 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 index 0000000000..66518743ee --- /dev/null +++ b/public/potlatch2/features/transport__tram.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/public/potlatch2/features/waterway__canal.png b/public/potlatch2/features/waterway__canal.png new file mode 100644 index 0000000000..64256429a5 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 index 0000000000..57c4ee3553 --- /dev/null +++ b/public/potlatch2/features/waterway__canal.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/public/potlatch2/features/waterway__dam.png b/public/potlatch2/features/waterway__dam.png new file mode 100644 index 0000000000..477ad3a05d 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 index 0000000000..dd6d2420e8 --- /dev/null +++ b/public/potlatch2/features/waterway__dam.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/public/potlatch2/features/waterway__river.png b/public/potlatch2/features/waterway__river.png new file mode 100644 index 0000000000..ad17f6b190 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 index 0000000000..ec31e83ee5 --- /dev/null +++ b/public/potlatch2/features/waterway__river.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/features/waterway__stream.png b/public/potlatch2/features/waterway__stream.png new file mode 100644 index 0000000000..1772d462b0 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 index 0000000000..3380ca13e4 --- /dev/null +++ b/public/potlatch2/features/waterway__stream.svg @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/fills/grass.jpg b/public/potlatch2/fills/grass.jpg new file mode 100644 index 0000000000..26dcd2f78f 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 index 0000000000..fe08e31acb --- /dev/null +++ b/public/potlatch2/gpx.css @@ -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 index 0000000000..2fdad623b0 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 index 0000000000..ab2d3bef43 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 index 0000000000..d12f23e1e0 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 index 0000000000..b2e7a24e5a 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 index 0000000000..aeae7df3ca 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 index 0000000000..4c3bb706ce 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 index 0000000000..d2ca4feedc 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 index 0000000000..b104403d1f 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 index 0000000000..8a980bef04 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 index 0000000000..b2a4aab5cb 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 index 0000000000..f72efcf7ee 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 index 0000000000..567779b2b1 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 index 0000000000..6a953d3484 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 index 0000000000..6a953d3484 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 index 0000000000..13f97e3598 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 index 0000000000..f8fda705df 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 index 0000000000..989feae561 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 index 0000000000..117bb80ba4 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 index 0000000000..8afe098efc 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 index 0000000000..f8c2f58a80 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 index 0000000000..7acc519265 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 index 0000000000..80ef74bd7d 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 index 0000000000..3b18ae7012 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 index 0000000000..cc78d874ee 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 index 0000000000..7714a3f1e6 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 index 0000000000..989e9c3827 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 index 0000000000..d9c1f77f64 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 index 0000000000..b5e4ddc134 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 index 0000000000..f43cabab2a 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 index 0000000000..ad6cd2c86f 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 index 0000000000..a93e2d3cf3 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 index 0000000000..ad2c39cc4e 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 index 0000000000..f387c03d8c 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 index 0000000000..897c526fc4 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 index 0000000000..fadd3e2680 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 index 0000000000..d5cc5a86fa 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 index 0000000000..075fc803ab 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 index 0000000000..c3d339de5c 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 index 0000000000..30682b2cfe 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 index 0000000000..b33e556259 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 index 0000000000..41ad28dd47 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 index 0000000000..ffc12561bd 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 index 0000000000..6cc0380db2 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 index 0000000000..f951247cff 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 index 0000000000..9b6d628de3 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 index 0000000000..8656f0c440 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 index 0000000000..7264bcbc66 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 index 0000000000..79346ab2ba 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 index 0000000000..33e76fba06 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 index 0000000000..a2675d0184 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 index 0000000000..a2675d0184 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 index 0000000000..5254d93b53 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 index 0000000000..9e3a4c5ffa 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 index 0000000000..488218c070 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 index 0000000000..3ef2b43882 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 index 0000000000..da271d3986 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 index 0000000000..8690ebb6e3 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 index 0000000000..32ee9afacf 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 index 0000000000..9259040516 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 index 0000000000..0aa2720857 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 index 0000000000..b03e915baf 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 index 0000000000..aa613d510f 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 index 0000000000..5b6da1444f 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 index 0000000000..45671d4aeb 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 index 0000000000..1067beb888 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 index 0000000000..2051002258 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 index 0000000000..76a52d2d67 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 index 0000000000..ef5b36624d 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 index 0000000000..172bd286fc 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 index 0000000000..b48859182b 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 index 0000000000..d80076058b 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 index 0000000000..78c578d71a 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 index 0000000000..d467b786e0 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 index 0000000000..b293dfdc73 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 index 0000000000..40fa49d9c0 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 index 0000000000..045696cad8 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 index 0000000000..f49d4e9f13 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 index 0000000000..37d2ecc8ee 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 index 0000000000..2d11d04178 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 index 0000000000..7d60e35985 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 index 0000000000..bcb07fdfe2 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 index 0000000000..f55ad666f5 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 index 0000000000..49ee19c29b 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 index 0000000000..266660a2dc 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 index 0000000000..8f7ddff0f7 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 index 0000000000..8e875c7f71 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 index 0000000000..f4dc6d1e24 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 index 0000000000..4107692378 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 index 0000000000..1e198259e4 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 index 0000000000..04944d16a7 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 index 0000000000..42c6f9203e 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 index 0000000000..c2a2d6242d 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 index 0000000000..897a1e1450 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 index 0000000000..87c49763ec 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 index 0000000000..d966889290 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 index 0000000000..35d488890b 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 index 0000000000..bd9a42bf06 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 index 0000000000..42f281523e 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 index 0000000000..ccfbe7e498 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 index 0000000000..944e27b102 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 index 0000000000..8b7e7f81a9 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 index 0000000000..36a4c450b9 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 index 0000000000..f529236498 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 index 0000000000..65ad843dbb 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 index 0000000000..c0c82dfddb 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 index 0000000000..781e749903 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 index 0000000000..2a9ecb0887 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 index 0000000000..a86124b209 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 index 0000000000..fc38eab9a9 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 index 0000000000..6fa7955e76 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 index 0000000000..aa93c115b8 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 index 0000000000..81fe31f345 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 index 0000000000..1571502e4d 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 index 0000000000..362bc9a036 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 index 0000000000..7960056316 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 index 0000000000..dfd7f83dd3 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 index 0000000000..567c4f5517 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 index 0000000000..471c4daa5c 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 index 0000000000..6659d1e16b 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 index 0000000000..0c9f7b4701 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 index 0000000000..23e6f1b16e 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 index 0000000000..29ddcc122c 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 index 0000000000..ddbbc4c5c1 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 index 0000000000..24c3f47588 --- /dev/null +++ b/public/potlatch2/imagery.xml @@ -0,0 +1,72 @@ + + + + + OSM - Mapnik + http://tile.openstreetmap.org/$z/$x/$y.png + + + OSM - Osmarender + http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png + + + OS OpenData Streetview + http://os.openstreetmap.org/sv/$z/$x/$y.png + OS OpenData StreetView + + + OS OpenData Locator + http://tiles.itoworld.com/os_locator/$z/$x/$y.png + OS OpenData Locator + + + OS 1:25k historic + http://ooc.openstreetmap.org/os1/$z/$x/$y.png + OS 1:25k + + + OS 7th Series historic + http://ooc.openstreetmap.org/os7/$z/$x/$y.png + OS7 + + + OS New Popular Edition historic + http://ooc.openstreetmap.org/npe/$z/$x/$y.png + NPE + + + OS Scottish Popular historic + http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg + NPE + + + Surrey aerial + http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png + Surrey aerial + + + NearMap aerial + http://www.nearmap.com/maps/nml=Vert&zxy=$z,$x,$y + NearMap + + + Haiti - GeoEye Jan 13 + http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg + Haiti GeoEye + + + Haiti - GeoEye Jan 13+ + http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg + Haiti GeoEye + + + Haiti - DigitalGlobe + http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg + Haiti DigitalGlobe + + + Haiti - Street names + http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg + Haiti streetnames + + diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml new file mode 100644 index 0000000000..c262122fb0 --- /dev/null +++ b/public/potlatch2/map_features.xml @@ -0,0 +1,3312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://wiki.openstreetmap.org/wiki/Key:cuisine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${operator} ${ref} + + + + + + + + + + ${operator} ${ref} + + + + + + + + + + + + ${ref}
+ ${name} + + + + + + + + ${ref}
+ ${name} + + + + + + + + ${ref}
+ ${name} + + + + + + + + + + + http://wiki.openstreetmap.org/wiki/Key:access + + + + + + + + + + + + http://wiki.openstreetmap.org/wiki/Key:cycleway + + + + + + + + + ${ref}
+ ${name} + + + + + + + ${ref}
+ ${name} + + + + + + + ${ref}
+ ${name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + roads + + ${ref}
+ + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmotorway + + + + + + + + + + roads + + + + + + + + + + roads + + ${ref}
+ ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrunk + + + + + + + + + + roads + + + + + + + + + + roads + + ${ref}
+ ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary + + + + + + + + + + roads + + ${ref}
+ ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dprimary_link + + + + + + + + + + + roads + + ${ref}
+ ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary + + + + + + + + + + roads + + + ${ref} + +
+ ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsecondary_link + + + + + + + + + + + + roads + + ${name}
+ ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary + + + + + + + + + + roads + + ${name}
+ ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary_link + + + + + + + + + + + roads + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified + + + + + + + + + + roads + + + ${name} + +
+ ${postal_code} +
+ + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dresidential + + + + + + + + + + roads + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dservice + + Access roads + + + + + + + + + + + + + + + + + + roads + + This road has not been given a specific type. It's a road, and that's all that's known. + + + + + + + + + + + roads + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dliving_street + + + + + + + + + + roads + + ${name} + + + + + + + + + + + + + + paths + + ${name} ${ref} + + + + + + + + + + paths + + ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} + + + + + + + + + + paths + + + ${name} + + + + + + + + + + + + + + + + + + + paths + + + + + + + + + + + paths + + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps + + + + + + + + + + + + natural + + ${name} +
+ + + + + + + + + natural + + + + + + + + + natural + + + + + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dditch + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dretaining_wall + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcity_wall + + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dfence + + + + + + + + + barrier + + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dhedge + + + + + + + + + + + + water + A very narrow river. + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + + barrier + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + transport + + ${name} + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + transport + + ${name} + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + + transport + + ${name} + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + + transport + + + + + + + + + + + transport + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + transport + + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + transport + + + + + http://wiki.openstreetmap.org/wiki/Key:aeroway + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + buildings + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + landuse + + + ${name} + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + + + + + + + + landuse + + + + + + + + + + natural + + + + + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + landuse + + + ${name} + + + + + + + + + + + power + + + + + + + + + + power + + + + + + + + + + power + + + + + + + + + power + + + + + + + + + power + + + + + + + + + + + + + + + + + + + + + + + + power + " + + + + + + + + + power + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + misc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dplace_of_worship + + + + + + + + + + + + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Atm + + + + + + + + + + amenity + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbank + + + + + + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling + + + + + + + + amenity + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool + + + + + + + + + + amenity + + ${ref} + + http://wiki.openstreetmap.org/wiki/Post_box + + + + + + + + + + + + accommodation + + http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dhotel + + + + + + + + + + accommodation + http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmotel + + + + + + + + + + + + accommodation + + + + + + + + + + + + accommodation + + + + + + + + + + + accommodation + + + + + + + + + + + accommodation + + + + + + + + + + + accommodation + + + + + + + + + + + accommodation + + + + + + + + + + + + + + + tourism + + + + + + + + + + + + + tourism + + http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum + + + + + + + + + + tourism + + + + + + + + + + + tourism + + + + + + + + + + + tourism + + + + + + + + + + + tourism + + + + + + + + + + tourism + + + + + + + + + + tourism + + + + + + + + + + tourism + + + + + + + + + + + tourism + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema + + + + + + + + + + tourism + + + + + + + + + + + tourism + + + + + + + + + + tourism + + + + + + + + + + + + tourism + + + + + + + + + + tourism + + + + + + + + + + + tourism + + + + + + + + + + + + + + aeroway + + http://wiki.openstreetmap.org/wiki/Tag:aeroway%3Daerodrome + + + + + + + + + transport + + ${name} ${local_ref} + + + + + + + + + + transport + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dparking + + + + + + + + + + + + + transport + + ${name} ${capacity} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_parking + + + + + + + + + + + + + + + + transport + + + ${name} + + + + + + + + + + + + + + transport + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + transport + + + + + + + + + + transport + + + + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dferry_terminal + + + + + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate + + + + + + + + + barrier + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dlift_gate + + + + + + + + barrier + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dkissing_gate + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid + + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dtoll_booth + + + + + + + + + + + barrier + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dstile + + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle + + + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Key:traffic%3Dcalming + + + + + + + + + + + + + + + + + + + + + + + foodanddrink + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub + + + + + + + + + + + + foodanddrink + + ${name} + + + + + + + + + + + + + foodanddrink + + ${name} + + + + + + + + + + + + + foodanddrink + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe + + + + + + + + + + + + + foodanddrink + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food + + + + + + + + + + + + + + shopping + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience + + + + + + + + + + + shopping + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + + + + + + + + + + + shopping + + ${name} + + http://wiki.openstreetmap.org/wiki/Pharmacy + + + + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + + + advanced + http://wiki.openstreetmap.org/wiki/Turn_restrictions + + + + + + + + + + + + + + + + + + + + + + + + + + + advanced + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + paths + + ${ref}
+ ${name} + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + + + transport + + + ${operator} ${ref} + + + + + + + + + + + + + + + + transport + + + ${operator} ${reg} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/opencyclemap.css b/public/potlatch2/opencyclemap.css new file mode 100644 index 0000000000..25d7fe1cad --- /dev/null +++ b/public/potlatch2/opencyclemap.css @@ -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 index 0000000000..d8d2c61548 --- /dev/null +++ b/public/potlatch2/potlatch.css @@ -0,0 +1,283 @@ +/* + + 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] { 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: 3;} + +/* 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[embankment=yes] { z-index: 6; opacity: 0.5; color: brown; width: eval('_width+16'); dashes: 2, 14; } + { z-index: 5; opacity: 0.5; color: brown; width: eval('_width+24'); dashes: 2, 30; } /* meh, improve this */ + +way[boundary=administrative] { color: purple; width: 10; opacity: 0.2; dashes: 12,24; } +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; } + +/* 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+8'); dashes: 2,15;} +way[access=permissive] { z-index: 10; color: green; width: eval('_width+6'); dashes: 1,7;} + +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:9; width: 2; color: black; dashes: 4,0;} { z-index:10; width: 2; color: #ffff00; dashes: 0, 4, 4, 0;} + /*IMHO (Steve Bennett), in early testing we want to highlight ways that aren't triggering rules */ +/* way !:drawn { z-index:10; width: 0.5; color: gray; } was like this */ +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 index 0000000000..00deef051e 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 index 0000000000..675251882d --- /dev/null +++ b/public/potlatch2/stylesheets.xml @@ -0,0 +1,20 @@ + + + + + Potlatch + potlatch.css + + + Wireframe + wireframe.css + + + OpenCycleMap + opencyclemap.css + + + GPS + gpx.css + + diff --git a/public/potlatch2/wireframe.css b/public/potlatch2/wireframe.css new file mode 100644 index 0000000000..e2ac8835d2 --- /dev/null +++ b/public/potlatch2/wireframe.css @@ -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; } +