From: Tom Hughes Date: Tue, 8 Mar 2011 20:26:25 +0000 (+0000) Subject: Update Potlatch 2 to 0.5-288-g9cbfeb6 build X-Git-Tag: live~6278^2~113 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/27809a2c548a73785b33e108a15d81ff2963ed63?ds=sidebyside Update Potlatch 2 to 0.5-288-g9cbfeb6 build --- diff --git a/public/potlatch2/features/aeroway__aerodrome.png b/public/potlatch2/features/aeroway__aerodrome.png new file mode 100644 index 000000000..1f3e08852 Binary files /dev/null and b/public/potlatch2/features/aeroway__aerodrome.png differ diff --git a/public/potlatch2/features/aeroway__apron.png b/public/potlatch2/features/aeroway__apron.png new file mode 100644 index 000000000..57bca99a2 Binary files /dev/null and b/public/potlatch2/features/aeroway__apron.png differ diff --git a/public/potlatch2/features/aeroway__helipad.png b/public/potlatch2/features/aeroway__helipad.png new file mode 100644 index 000000000..2e575dbbc Binary files /dev/null and b/public/potlatch2/features/aeroway__helipad.png differ diff --git a/public/potlatch2/features/aeroway__runway.png b/public/potlatch2/features/aeroway__runway.png new file mode 100644 index 000000000..bbac49e8e Binary files /dev/null and b/public/potlatch2/features/aeroway__runway.png differ diff --git a/public/potlatch2/features/aeroway__taxiway.png b/public/potlatch2/features/aeroway__taxiway.png new file mode 100644 index 000000000..a5eda4d6a Binary files /dev/null and b/public/potlatch2/features/aeroway__taxiway.png differ diff --git a/public/potlatch2/features/aeroway__terminal.png b/public/potlatch2/features/aeroway__terminal.png new file mode 100644 index 000000000..1f5857534 Binary files /dev/null and b/public/potlatch2/features/aeroway__terminal.png differ diff --git a/public/potlatch2/features/amenity__bus_station.png b/public/potlatch2/features/amenity__bus_station.png new file mode 100644 index 000000000..b39567edd Binary files /dev/null and b/public/potlatch2/features/amenity__bus_station.png differ diff --git a/public/potlatch2/features/amenity__parking.png b/public/potlatch2/features/amenity__parking.png new file mode 100644 index 000000000..0ea905139 Binary files /dev/null and b/public/potlatch2/features/amenity__parking.png differ diff --git a/public/potlatch2/features/barrier_generic.svg b/public/potlatch2/features/barrier_generic.svg deleted file mode 100644 index eaefcb155..000000000 --- a/public/potlatch2/features/barrier_generic.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/public/potlatch2/features/cycle__lcn.png b/public/potlatch2/features/cycle__lcn.png deleted file mode 100644 index b46ab059b..000000000 Binary files a/public/potlatch2/features/cycle__lcn.png and /dev/null differ diff --git a/public/potlatch2/features/cycle__ncn.png b/public/potlatch2/features/cycle__ncn.png deleted file mode 100644 index 49456c48f..000000000 Binary files a/public/potlatch2/features/cycle__ncn.png and /dev/null differ diff --git a/public/potlatch2/features/cycle__rcn.png b/public/potlatch2/features/cycle__rcn.png deleted file mode 100644 index ed79223bc..000000000 Binary files a/public/potlatch2/features/cycle__rcn.png and /dev/null differ diff --git a/public/potlatch2/features/manmade_lighthouse.png b/public/potlatch2/features/manmade_lighthouse.png new file mode 100644 index 000000000..6aaf5f9ff Binary files /dev/null and b/public/potlatch2/features/manmade_lighthouse.png differ diff --git a/public/potlatch2/features/manmade_silo.png b/public/potlatch2/features/manmade_silo.png new file mode 100644 index 000000000..be207ce02 Binary files /dev/null and b/public/potlatch2/features/manmade_silo.png differ diff --git a/public/potlatch2/features/manmade_tower.png b/public/potlatch2/features/manmade_tower.png new file mode 100644 index 000000000..bcb4e3f40 Binary files /dev/null and b/public/potlatch2/features/manmade_tower.png differ diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png index 2a80e9f3e..e8e680574 100644 Binary files a/public/potlatch2/features/oneway__-1.png 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 index b768ab05c..a50e12ffa 100644 Binary files a/public/potlatch2/features/oneway__no.png 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 index e62054cbf..4236836ad 100644 Binary files a/public/potlatch2/features/oneway__yes.png and b/public/potlatch2/features/oneway__yes.png differ diff --git a/public/potlatch2/features/paths__bike.svg b/public/potlatch2/features/paths__bike.svg deleted file mode 100644 index a2224821f..000000000 --- a/public/potlatch2/features/paths__bike.svg +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__bridleway.svg b/public/potlatch2/features/paths__bridleway.svg deleted file mode 100644 index 8688699f9..000000000 --- a/public/potlatch2/features/paths__bridleway.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__footway.svg b/public/potlatch2/features/paths__footway.svg deleted file mode 100644 index b218d1a06..000000000 --- a/public/potlatch2/features/paths__footway.svg +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__pedestrian.svg b/public/potlatch2/features/paths__pedestrian.svg deleted file mode 100644 index 55ce9d60a..000000000 --- a/public/potlatch2/features/paths__pedestrian.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__steps.svg b/public/potlatch2/features/paths__steps.svg deleted file mode 100644 index ebbe95667..000000000 --- a/public/potlatch2/features/paths__steps.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__unknown.png b/public/potlatch2/features/paths__unknown.png deleted file mode 100644 index b050bc38b..000000000 Binary files a/public/potlatch2/features/paths__unknown.png and /dev/null differ diff --git a/public/potlatch2/features/paths__unknown.svg b/public/potlatch2/features/paths__unknown.svg deleted file mode 100644 index 32831691e..000000000 --- a/public/potlatch2/features/paths__unknown.svg +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/public/potlatch2/features/paths__unofficial.png b/public/potlatch2/features/paths__unofficial.png new file mode 100644 index 000000000..fa428df53 Binary files /dev/null and b/public/potlatch2/features/paths__unofficial.png differ diff --git a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png index 71d79bd10..68b8b04ef 100644 Binary files a/public/potlatch2/features/pois/accommodation_shelter2.n.24.png and b/public/potlatch2/features/pois/accommodation_shelter2.n.24.png differ diff --git a/public/potlatch2/features/pois/amenity_town_hall.n.24.png b/public/potlatch2/features/pois/amenity_town_hall.n.24.png new file mode 100644 index 000000000..390289c4d Binary files /dev/null and b/public/potlatch2/features/pois/amenity_town_hall.n.24.png differ diff --git a/public/potlatch2/features/pois/amenity_vendingmachine.png b/public/potlatch2/features/pois/amenity_vendingmachine.png new file mode 100644 index 000000000..58f033372 Binary files /dev/null and b/public/potlatch2/features/pois/amenity_vendingmachine.png differ diff --git a/public/potlatch2/features/pois/barrier_generic.svg b/public/potlatch2/features/pois/barrier_generic.svg deleted file mode 100644 index 2473955df..000000000 --- a/public/potlatch2/features/pois/barrier_generic.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/public/potlatch2/features/pois/flowers.png b/public/potlatch2/features/pois/flowers.png deleted file mode 100644 index ba6298d1b..000000000 Binary files a/public/potlatch2/features/pois/flowers.png and /dev/null differ diff --git a/public/potlatch2/features/pois/health_hospital.n.24.png b/public/potlatch2/features/pois/health_hospital.n.24.png index e9b114a71..62e68fb87 100644 Binary files a/public/potlatch2/features/pois/health_hospital.n.24.png 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 index 4fe2fc7d0..d2aa8c2ec 100644 Binary files a/public/potlatch2/features/pois/health_pharmacy.n.24.png and b/public/potlatch2/features/pois/health_pharmacy.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 index e081dd521..f1e55e803 100644 Binary files a/public/potlatch2/features/pois/money_atm.n.24.png 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 index 873adc71e..74c511472 100644 Binary files a/public/potlatch2/features/pois/money_bank2.n.24.png and b/public/potlatch2/features/pois/money_bank2.n.24.png differ diff --git a/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png new file mode 100644 index 000000000..103a21b2a Binary files /dev/null and b/public/potlatch2/features/pois/place_of_worship_unknown.n.24.png differ diff --git a/public/potlatch2/features/pois/poi_place_city.p.24.png b/public/potlatch2/features/pois/poi_place_city.p.24.png new file mode 100644 index 000000000..d2f629cf9 Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_city.p.24.png differ diff --git a/public/potlatch2/features/pois/poi_place_hamlet.p.24.png b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png new file mode 100644 index 000000000..1a938cef9 Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_hamlet.p.24.png differ diff --git a/public/potlatch2/features/pois/poi_place_suburb.p.24.png b/public/potlatch2/features/pois/poi_place_suburb.p.24.png new file mode 100644 index 000000000..633e1804c Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_suburb.p.24.png differ diff --git a/public/potlatch2/features/pois/poi_place_town.p.24.png b/public/potlatch2/features/pois/poi_place_town.p.24.png new file mode 100644 index 000000000..b456dc22b Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_town.p.24.png differ diff --git a/public/potlatch2/features/pois/poi_place_village.p.24.png b/public/potlatch2/features/pois/poi_place_village.p.24.png new file mode 100644 index 000000000..ee050b4e6 Binary files /dev/null and b/public/potlatch2/features/pois/poi_place_village.p.24.png differ diff --git a/public/potlatch2/features/pois/power_station.png b/public/potlatch2/features/pois/power_station.png new file mode 100644 index 000000000..3417b4d3c Binary files /dev/null and b/public/potlatch2/features/pois/power_station.png differ diff --git a/public/potlatch2/features/pois/shopping_florist.n.24.png b/public/potlatch2/features/pois/shopping_florist.n.24.png new file mode 100644 index 000000000..6dd9376b3 Binary files /dev/null and b/public/potlatch2/features/pois/shopping_florist.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 index 416247f30..a4f9b3260 100644 Binary files a/public/potlatch2/features/pois/shopping_garden_centre.n.24.png and b/public/potlatch2/features/pois/shopping_garden_centre.n.24.png differ diff --git a/public/potlatch2/features/pois/shopping_toy.n.24.png b/public/potlatch2/features/pois/shopping_toy.n.24.png new file mode 100644 index 000000000..08d7db0e1 Binary files /dev/null and b/public/potlatch2/features/pois/shopping_toy.n.24.png differ diff --git a/public/potlatch2/features/pois/sport_shooting.n.24.png b/public/potlatch2/features/pois/sport_shooting.n.24.png new file mode 100644 index 000000000..9e50b0029 Binary files /dev/null and b/public/potlatch2/features/pois/sport_shooting.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_airport.n.24.png b/public/potlatch2/features/pois/transport_airport.n.24.png new file mode 100644 index 000000000..4e6bddb53 Binary files /dev/null and b/public/potlatch2/features/pois/transport_airport.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png new file mode 100644 index 000000000..e5e4e2fe7 Binary files /dev/null and b/public/potlatch2/features/pois/transport_helicopter_pad.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png b/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png new file mode 100644 index 000000000..f52dc06ad Binary files /dev/null and b/public/potlatch2/features/pois/transport_mini_roundabout.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_slipway.n.24.png b/public/potlatch2/features/pois/transport_slipway.n.24.png new file mode 100644 index 000000000..f7d07a678 Binary files /dev/null and b/public/potlatch2/features/pois/transport_slipway.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_traffic_calming.n.24.png b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png new file mode 100644 index 000000000..5c50233cd Binary files /dev/null and b/public/potlatch2/features/pois/transport_traffic_calming.n.24.png differ diff --git a/public/potlatch2/features/pois/transport_weir.n.24.png b/public/potlatch2/features/pois/transport_weir.n.24.png new file mode 100644 index 000000000..e699d3b05 Binary files /dev/null and b/public/potlatch2/features/pois/transport_weir.n.24.png differ diff --git a/public/potlatch2/features/pois/water_generic.svg b/public/potlatch2/features/pois/water_generic.svg deleted file mode 100644 index fcfbc24d2..000000000 --- a/public/potlatch2/features/pois/water_generic.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/public/potlatch2/features/power_high.svg b/public/potlatch2/features/power_high.svg deleted file mode 100644 index 619562fd7..000000000 --- a/public/potlatch2/features/power_high.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/public/potlatch2/features/power_low.svg b/public/potlatch2/features/power_low.svg deleted file mode 100644 index 0cec276c0..000000000 --- a/public/potlatch2/features/power_low.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/public/potlatch2/features/railway__abandoned.png b/public/potlatch2/features/railway__abandoned.png new file mode 100644 index 000000000..3b7a02ed5 Binary files /dev/null and b/public/potlatch2/features/railway__abandoned.png differ diff --git a/public/potlatch2/features/railway__disused.png b/public/potlatch2/features/railway__disused.png new file mode 100644 index 000000000..2b24f69a8 Binary files /dev/null and b/public/potlatch2/features/railway__disused.png differ diff --git a/public/potlatch2/features/railway__light.png b/public/potlatch2/features/railway__light.png new file mode 100644 index 000000000..0e2eca7c2 Binary files /dev/null and b/public/potlatch2/features/railway__light.png differ diff --git a/public/potlatch2/features/railway__platform.png b/public/potlatch2/features/railway__platform.png new file mode 100644 index 000000000..e6d591979 Binary files /dev/null and b/public/potlatch2/features/railway__platform.png differ diff --git a/public/potlatch2/features/railway__preserved.png b/public/potlatch2/features/railway__preserved.png new file mode 100644 index 000000000..28d4f5ccd Binary files /dev/null and b/public/potlatch2/features/railway__preserved.png differ diff --git a/public/potlatch2/features/railway__rail.png b/public/potlatch2/features/railway__rail.png new file mode 100644 index 000000000..0aa4e66d6 Binary files /dev/null and b/public/potlatch2/features/railway__rail.png differ diff --git a/public/potlatch2/features/railway__siding.png b/public/potlatch2/features/railway__siding.png new file mode 100644 index 000000000..9519ee0a1 Binary files /dev/null and b/public/potlatch2/features/railway__siding.png differ diff --git a/public/potlatch2/features/railway__spur.png b/public/potlatch2/features/railway__spur.png new file mode 100644 index 000000000..4cde3d8e7 Binary files /dev/null and b/public/potlatch2/features/railway__spur.png differ diff --git a/public/potlatch2/features/railway__subway.png b/public/potlatch2/features/railway__subway.png new file mode 100644 index 000000000..7e13bd022 Binary files /dev/null and b/public/potlatch2/features/railway__subway.png differ diff --git a/public/potlatch2/features/railway__tram.png b/public/potlatch2/features/railway__tram.png new file mode 100644 index 000000000..2940c7a8f Binary files /dev/null and b/public/potlatch2/features/railway__tram.png differ diff --git a/public/potlatch2/features/route__bus.png b/public/potlatch2/features/route__bus.png new file mode 100644 index 000000000..bb816ac83 Binary files /dev/null and b/public/potlatch2/features/route__bus.png differ diff --git a/public/potlatch2/features/route__lcn.png b/public/potlatch2/features/route__lcn.png new file mode 100644 index 000000000..21d59163e Binary files /dev/null and b/public/potlatch2/features/route__lcn.png differ diff --git a/public/potlatch2/features/route__lwn.png b/public/potlatch2/features/route__lwn.png new file mode 100644 index 000000000..50ee446bd Binary files /dev/null and b/public/potlatch2/features/route__lwn.png differ diff --git a/public/potlatch2/features/route__ncn.png b/public/potlatch2/features/route__ncn.png new file mode 100644 index 000000000..7cc777919 Binary files /dev/null and b/public/potlatch2/features/route__ncn.png differ diff --git a/public/potlatch2/features/route__nwn.png b/public/potlatch2/features/route__nwn.png new file mode 100644 index 000000000..92ac04879 Binary files /dev/null and b/public/potlatch2/features/route__nwn.png differ diff --git a/public/potlatch2/features/route__rcn.png b/public/potlatch2/features/route__rcn.png new file mode 100644 index 000000000..614ac951f Binary files /dev/null and b/public/potlatch2/features/route__rcn.png differ diff --git a/public/potlatch2/features/route__rwn.png b/public/potlatch2/features/route__rwn.png new file mode 100644 index 000000000..fff9b233a Binary files /dev/null and b/public/potlatch2/features/route__rwn.png differ diff --git a/public/potlatch2/features/transport__bus.png b/public/potlatch2/features/transport__bus.png deleted file mode 100644 index b779706f5..000000000 Binary files a/public/potlatch2/features/transport__bus.png and /dev/null differ diff --git a/public/potlatch2/features/transport__railway.svg b/public/potlatch2/features/transport__railway.svg deleted file mode 100644 index efd37fea1..000000000 --- a/public/potlatch2/features/transport__railway.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/public/potlatch2/features/transport__subway.svg b/public/potlatch2/features/transport__subway.svg deleted file mode 100644 index 4dcd213ea..000000000 --- a/public/potlatch2/features/transport__subway.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/public/potlatch2/features/transport__tram.svg b/public/potlatch2/features/transport__tram.svg deleted file mode 100644 index 66518743e..000000000 --- a/public/potlatch2/features/transport__tram.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/public/potlatch2/features/waterway__basin.png b/public/potlatch2/features/waterway__basin.png new file mode 100644 index 000000000..29798db20 Binary files /dev/null and b/public/potlatch2/features/waterway__basin.png differ diff --git a/public/potlatch2/features/waterway__canal.svg b/public/potlatch2/features/waterway__canal.svg deleted file mode 100644 index 57c4ee355..000000000 --- a/public/potlatch2/features/waterway__canal.svg +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/public/potlatch2/features/waterway__coastline.png b/public/potlatch2/features/waterway__coastline.png new file mode 100644 index 000000000..2239eb097 Binary files /dev/null and b/public/potlatch2/features/waterway__coastline.png differ diff --git a/public/potlatch2/features/waterway__dam.png b/public/potlatch2/features/waterway__dam.png index 477ad3a05..c5f720e89 100644 Binary files a/public/potlatch2/features/waterway__dam.png 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 deleted file mode 100644 index dd6d2420e..000000000 --- a/public/potlatch2/features/waterway__dam.svg +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/public/potlatch2/features/waterway__dock.png b/public/potlatch2/features/waterway__dock.png new file mode 100644 index 000000000..e6e40d1ff Binary files /dev/null and b/public/potlatch2/features/waterway__dock.png differ diff --git a/public/potlatch2/features/waterway__lake.png b/public/potlatch2/features/waterway__lake.png new file mode 100644 index 000000000..275bb5722 Binary files /dev/null and b/public/potlatch2/features/waterway__lake.png differ diff --git a/public/potlatch2/features/waterway__marina.png b/public/potlatch2/features/waterway__marina.png new file mode 100644 index 000000000..3704b0011 Binary files /dev/null and b/public/potlatch2/features/waterway__marina.png differ diff --git a/public/potlatch2/features/waterway__reservoir.png b/public/potlatch2/features/waterway__reservoir.png new file mode 100644 index 000000000..bd118e6db Binary files /dev/null and b/public/potlatch2/features/waterway__reservoir.png differ diff --git a/public/potlatch2/features/waterway__river.svg b/public/potlatch2/features/waterway__river.svg deleted file mode 100644 index ec31e83ee..000000000 --- a/public/potlatch2/features/waterway__river.svg +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/potlatch2/features/waterway__riverbank.png b/public/potlatch2/features/waterway__riverbank.png new file mode 100644 index 000000000..7152808d5 Binary files /dev/null and b/public/potlatch2/features/waterway__riverbank.png differ diff --git a/public/potlatch2/features/waterway__stream.svg b/public/potlatch2/features/waterway__stream.svg deleted file mode 100644 index 3380ca13e..000000000 --- a/public/potlatch2/features/waterway__stream.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/public/potlatch2/help/introduction.jpg b/public/potlatch2/help/introduction.jpg new file mode 100644 index 000000000..c24ce535d Binary files /dev/null and b/public/potlatch2/help/introduction.jpg differ diff --git a/public/potlatch2/help/introduction.mp4 b/public/potlatch2/help/introduction.mp4 new file mode 100644 index 000000000..98007921c Binary files /dev/null and b/public/potlatch2/help/introduction.mp4 differ diff --git a/public/potlatch2/icons/health_pharmacy.n.16.png b/public/potlatch2/icons/health_pharmacy.n.16.png index ffc12561b..1827b0a69 100644 Binary files a/public/potlatch2/icons/health_pharmacy.n.16.png and b/public/potlatch2/icons/health_pharmacy.n.16.png differ diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf new file mode 100644 index 000000000..808dde897 Binary files /dev/null and b/public/potlatch2/locales/en_GB.swf differ diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf new file mode 100644 index 000000000..6fd64130a Binary files /dev/null and b/public/potlatch2/locales/en_US.swf differ diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf new file mode 100644 index 000000000..26f933774 Binary files /dev/null and b/public/potlatch2/locales/fr_FR.swf differ diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml index 42d272833..93d7209fc 100644 --- a/public/potlatch2/map_features.xml +++ b/public/potlatch2/map_features.xml @@ -10,6 +10,7 @@ Quick documentation: category: [ctext] corresponding to category id icon @image: path to .png file + @dnd: path to optional dnd-specific-override .png file @background: colour spec @foreground: colour spec (general html goes here?) Variables substituted with ${ref} @@ -42,69 +43,36 @@ Quick documentation: @k: key @v: value icon: see above + + + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -112,12 +80,23 @@ Quick documentation: + + + + + + + + + + + @@ -207,6 +186,7 @@ Quick documentation: + @@ -419,7 +399,7 @@ Quick documentation: - + ${operator} ${ref} @@ -441,7 +421,7 @@ Quick documentation: - + ${ref}
${name} @@ -450,7 +430,7 @@ Quick documentation: - + ${ref}
${name} @@ -459,7 +439,7 @@ Quick documentation: - + ${ref}
${name} @@ -470,11 +450,11 @@ Quick documentation: - + + - http://wiki.openstreetmap.org/wiki/Key:access @@ -489,8 +469,6 @@ Quick documentation: - - http://wiki.openstreetmap.org/wiki/Key:cycleway @@ -498,24 +476,27 @@ Quick documentation: + - + ${ref}
${name} + - + ${ref}
${name} + - + ${ref}
${name} @@ -528,7 +509,7 @@ Quick documentation: - + @@ -536,37 +517,37 @@ Quick documentation: - + - + - + - + - + - + - + - + @@ -593,3266 +574,59 @@ Quick documentation: - - - - 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} - - - - - - - - - - - roads - sport - - A purpose built track for racing motor vehicles. - - - - - - - - - - - - - roads - sport - - A purpose built track for running, cycling, greyhound racing, horse racing. - - - - - - - - - - - - - - - - - - paths - - ${name} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway - - - - - - - - - paths - - ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway - - - - - - - - - paths - - ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath - - - - - - - - - - - paths - - - ${name} - - - - - - - - - - - - - - - - - - - - paths - - - - - - - - - - - - paths - - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps - - - - - - - - - - - - natural - sport - - ${name} -
- - - - - - - - - natural - + + + + + + + + + + + + + + + + + - - - - - - natural - + - - - - + + + + + + + + + + + + + - - - - - - water - A very narrow river. - - - ${name} - - - - - - - - - - - - water - - ${name} - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - water - - ${name} - - - - - - - - - - - - barrier - - - ${name} - - - - - - - - - - - - water - - ${name} - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - + + + advanced + + - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - water - - - ${name} - - - - - - - - - - - - - water - - - - - - - - - water - - - - - - - - - - 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 - shopping - - - - - - - - - - - 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 - - - - ${name} - - - - - - - - landuse - - - - ${name} - - - - - - - - landuse - - - - - - - - - - landuse - - - - - - - - - - natural - - - - - - - - - - - - - sport - - - - ${name} - - - - - - - - - sport - - - ${name} - - - - - - - - - landuse - sport - - - ${name} - - - - - - - - - landuse - - - ${name} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - landuse - sport - - - ${name} - - - - - - - - - - - power - - - - - - - - - - power - - - - - - - - - - power - - - - - - - - - power - - - - - - - - - power - - - - - - - - - - - - - - - - - - - - - - - - power - " - - - - - - - - - power - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - places - - - - - - - - - - - places - - - - - - - - - - - places - - - - - - - - - - - places - - - - - - - - - - - places - - - - - - - - - - - - - - - amenity - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station - - - - - - - - - amenity - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice - - - - - - - - - amenity - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary - - - - - - - - - - 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 - buildings - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten - - - - - - - - - amenity - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall - - - - - - - - - - amenity - - ${ref} - - http://wiki.openstreetmap.org/wiki/Post_box - - - - - - - - - amenity - buildings - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office - - - - - - - - - - - amenity - - ${ref} - - http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket - - - - - - - - amenity - - ${ref} - - - - - - - - amenity - water - foodanddrink - - ${ref} - - - - - - - - amenity - - ${name} - - - - - - - - - - - amenity - - - - - - - - - amenity - sport - - - - - - - - - - amenity - - - - - - - - amenity - - - - - - - - amenity - - - - - - - - - - - amenity - sport - - ${name} - - - - - - - - - - - amenity - - ${name} - - - - - - - - - amenity - foodanddrink - A vending machine. - - - - - - - - - - - - - - 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 - - ${name} ${addr:housename}
- ${addr:housenumber} ${addr:street} ${addr:postcode} - - - - - - - - - - - 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%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 - - - - - - - - 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 - - - - - - - - barrier - - - http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence - - - - - - - - - - transport - - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle - - - - - - - transport - http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout - - - - - - - - - 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%3Dsupermarket - - - - - - - - - - shopping - - ${name} - - http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience - - - - - - - - - - shopping - - - - - - - - - - - - - - shopping - - - - - - - - - - - - - shopping - - - - - - - - - - - - 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 - - - - - - - - - - - places - - - http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative - - - - - - - - places - natural - - http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park - - - - - - - places - - http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code - - - - - - - places - natural - - http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area - - - - - - - places - - http://wiki.openstreetmap.org/wiki/Tag:boundary=town - - - - - - - - - places - - http://wiki.openstreetmap.org/wiki/Tag:boundary=census - - - - - - - - - - - - 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/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml new file mode 100644 index 000000000..7b6ef52e2 --- /dev/null +++ b/public/potlatch2/map_features/amenities.xml @@ -0,0 +1,398 @@ + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfire_station + + + + + + + + + amenity + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpolice + + + + + + + + + amenity + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary + + + + + + + + + + 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 + buildings + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten + + + + + + + + + amenity + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtownhall + + + + + + + + + + amenity + + ${ref} + + http://wiki.openstreetmap.org/wiki/Post_box + + + + + + + + + amenity + buildings + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office + + + + + + + + + + + amenity + + ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket + + + + + + + + amenity + + ${ref} + + + + + + + + amenity + foodanddrink + + ${ref} + + + + + + + + amenity + + ${name} + + + + + + + + + + + amenity + + + + + + + + + sport + + + + + + + + + + amenity + + + + + + + + amenity + + + + + + + + amenity + + + + + + + + + + + amenity + sport + + ${name} + + + + + + + + + + + amenity + + ${name} + + + + + + + + + amenity + foodanddrink + A vending machine. + + + + + + + + + + + + + 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 + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/barriers.xml b/public/potlatch2/map_features/barriers.xml new file mode 100644 index 000000000..2b82a5ad0 --- /dev/null +++ b/public/potlatch2/map_features/barriers.xml @@ -0,0 +1,191 @@ + + + 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 + + + + + + + + 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 + + + + + + + + barrier + + + http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwire_fence + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml new file mode 100644 index 000000000..5a3205f67 --- /dev/null +++ b/public/potlatch2/map_features/buildings.xml @@ -0,0 +1,272 @@ + + + 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 + shopping + + + + + + + + + + + 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} + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml new file mode 100644 index 000000000..20ad351d8 --- /dev/null +++ b/public/potlatch2/map_features/landuse.xml @@ -0,0 +1,328 @@ + + + + landuse + + + ${name} + + + + + + + + + landuse + + + ${name} + + + + + + + + landuse + + + ${name} + + + + + + + + landuse + + + ${name} + + + + + + + + landuse + + + ${name} + + + + + + + + + shopping + + + + ${name} + + + + + + + + + landuse + + + + ${name} + + + + + + + + landuse + + + + ${name} + + + + + + + + landuse + + + + + + + + + + landuse + + + + + + + + + + natural + + + + + + + + + + + + + sport + + + + ${name} + + + + + + + + + sport + + + ${name} + + + + + + + + + sport + + + ${name} + + + + + + + + + sport + + + ${name} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sport + + + + ${name} + A purpose built track for running, cycling, greyhound racing, horse racing. + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + agriculture + + + + + + + + + + + natural + sport + + ${name} +
+ + + + + + + + + natural + + + + + + + + + natural + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/man_made.xml b/public/potlatch2/map_features/man_made.xml new file mode 100644 index 000000000..52db9362c --- /dev/null +++ b/public/potlatch2/map_features/man_made.xml @@ -0,0 +1,65 @@ + + + manmade + + + + + + + + + + + + + + + + + + + + + + + manmade + + + + + + + + + + + + + + + + + manmade + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml new file mode 100644 index 000000000..fbac906b6 --- /dev/null +++ b/public/potlatch2/map_features/paths.xml @@ -0,0 +1,174 @@ + + + paths + + ${name} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dfootway + + + + + + + + + paths + + ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dcycleway + + + + + + + + + + + + + paths + + + ${name} + + + + + + + + + + + + + + + + + + + + paths + + + + + + + + + + + + paths + + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dsteps + + + + + + + + + + paths + + ${name} ${ncn_ref} ${rcn_ref} ${lcn_ref} ${ref} + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + + paths + + ${ref}
+ ${name} + + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + + + + + paths + + + ${ref} + +
+ ${name} + + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/places.xml b/public/potlatch2/map_features/places.xml new file mode 100644 index 000000000..0beea2377 --- /dev/null +++ b/public/potlatch2/map_features/places.xml @@ -0,0 +1,114 @@ + + + places + + + + + + + + + + + places + + + + + + + + + + + places + + + + + + + + + + + places + + + + + + + + + + + places + + + + + + + + + + + + + places + + + http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative + + + + + + + + places + natural + + http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park + + + + + + + places + natural + + http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area + + + + + + + places + + http://wiki.openstreetmap.org/wiki/Tag:boundary=town + + + + + + + + + places + + http://wiki.openstreetmap.org/wiki/Tag:boundary=census + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/power.xml b/public/potlatch2/map_features/power.xml new file mode 100644 index 000000000..47769a77c --- /dev/null +++ b/public/potlatch2/map_features/power.xml @@ -0,0 +1,82 @@ + + + power + + + + + + + + + + power + + + + + + + + + + power + + + + + + + + + power + + + + + + + + + power + + + + + + + + + + + + + + + + + + + + + + + + power + " + + + + + + + + + power + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml new file mode 100644 index 000000000..a9da30379 --- /dev/null +++ b/public/potlatch2/map_features/roads.xml @@ -0,0 +1,343 @@ + + + + + + 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} + + + + + + + + + + + sport + + A purpose built track for racing motor vehicles. + + + + + + + + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dturning_circle + + + + + + + transport + + http://wiki.openstreetmap.org/wiki/Tag:highway%3Dmini_roundabout + + + + + + + + transport + + + + + + + + + + + + + + + + + + + + advanced + http://wiki.openstreetmap.org/wiki/Turn_restrictions + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/shopping.xml b/public/potlatch2/map_features/shopping.xml new file mode 100644 index 000000000..b7055bfe2 --- /dev/null +++ b/public/potlatch2/map_features/shopping.xml @@ -0,0 +1,347 @@ + + + shopping + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket + + + + + + + + + + + shopping + + ${name} + + http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience + + + + + + + + + + + shopping + + + + + + + + + + + + + + + shopping + + + + + + + + + + + + + + shopping + + + + + + + + + + + + + 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 + + + + + + + + + + + + shopping + + + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/tourism.xml b/public/potlatch2/map_features/tourism.xml new file mode 100644 index 000000000..c03452f26 --- /dev/null +++ b/public/potlatch2/map_features/tourism.xml @@ -0,0 +1,271 @@ + + + + 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 + + ${name} ${addr:housename}
+ ${addr:housenumber} ${addr:street} ${addr:postcode} + + + + + + + + + + + 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 + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml new file mode 100644 index 000000000..a039e0ad8 --- /dev/null +++ b/public/potlatch2/map_features/transport.xml @@ -0,0 +1,480 @@ + + + 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 + + + + + + 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 + + + + + + + + + + + + transport + + + ${operator} ${ref} + + + + + + + + + + + + + + + + transport + + + ${operator} ${reg} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/potlatch2/map_features/water.xml b/public/potlatch2/map_features/water.xml new file mode 100644 index 000000000..e58c0c331 --- /dev/null +++ b/public/potlatch2/map_features/water.xml @@ -0,0 +1,196 @@ + + + water + A very narrow river. + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + ${name} + + + + + + + + + + + water + A structure for holding water in a reservoir + + + ${name} + + + + + + + + + + + + water + + ${name} + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + water + + + ${name} + + + + + + + + + + + + + water + + + + + + + + + + water + The average high tide line, with water on the right-hand side + + + + + + \ No newline at end of file diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf index dd42fe1a7..c3114f99b 100644 Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css index 469aec8ca..9e087f59c 100644 --- a/public/potlatch2/stylesheets/core_ways.css +++ b/public/potlatch2/stylesheets/core_ways.css @@ -11,7 +11,8 @@ way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0 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] { z-index: 6; color: #FEFECB; width: 5; casing-width: 7; } +way[highway=unclassified] { z-index: 6; color: #D0D0D0; 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; } @@ -121,3 +122,4 @@ way[tunnel=yes][!waterway] /* Attribute decoration */ way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; } +way[oneway=-1] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; } diff --git a/public/potlatch2/stylesheets/wireframe.css b/public/potlatch2/stylesheets/wireframe.css index e2ac8835d..9fbb829ce 100644 --- a/public/potlatch2/stylesheets/wireframe.css +++ b/public/potlatch2/stylesheets/wireframe.css @@ -12,4 +12,6 @@ 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; } +node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 3; color: black; } +node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }