From: Tom Hughes Date: Sat, 8 Oct 2011 11:50:23 +0000 (+0100) Subject: Update Potlatch 2 to 2.3-75-g0d119e0 build X-Git-Tag: live~6185 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/14b16706059e2fd699baff2ffffb5cef34f80948?ds=sidebyside Update Potlatch 2 to 2.3-75-g0d119e0 build --- diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf index cfeb3cbf7..2ed7dd2f8 100644 Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf index 2f8f4a748..c6752149b 100644 Binary files a/public/potlatch2/locales/en_GB.swf 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 index e0b896318..443c7f6ec 100644 Binary files a/public/potlatch2/locales/en_US.swf 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 index 55003470f..fb5e8dc78 100644 Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf index bd1d4b0b2..7876a5c8f 100644 Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf index a8bee6ba0..1a3022ea9 100644 Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css new file mode 100644 index 000000000..ef9442782 --- /dev/null +++ b/public/potlatch2/stylesheets/snapshot.css @@ -0,0 +1,24 @@ +/* + + Stylesheet that does simple wireframe display + +*/ + +way :hover { z-index: 2; width: 1; color: yellow; } +way :selected { z-index: 2; width: 2; color: yellow; } +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; } +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; } + +way[_status=incomplete]::statushighlight { z-index: 0; width: 10; color: #d95f02; } +way[_status=complete]::statushighlight { z-index: 0; width: 10; color: #1b9e77; opacity: 0.4; } +node[_status=incomplete]::statushighlight :hasTags { z-index: 0; icon-image: square; icon-width: 10; color: #d95f02; } +node[_status=complete]::statushighlight :hasTags { z-index: 0; icon-image: square; icon-width: 10; color: #1b9e77; opacity: 0.4; } + + + diff --git a/public/potlatch2/vectors.xml b/public/potlatch2/vectors.xml index d9a817491..3d260d45d 100644 --- a/public/potlatch2/vectors.xml +++ b/public/potlatch2/vectors.xml @@ -14,7 +14,7 @@ http://80.242.147.84/osmbugs/api/ e4d47b6b8c26e822a62d747b802f98ac - + Bike Shop Locator - Missing Shops BikeShopLoader http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/ @@ -25,9 +25,9 @@ - A particular GPX file - GPXImporter - http://gravitystorm.dev.openstreetmap.org/gpx/crossdomain.xml - http://gravitystorm.dev.openstreetmap.org/gpx/112.gpx + CNXC + SnapshotLoader + http://localhost:3000/crossdomain.xml + http://localhost:3000/api/ - \ No newline at end of file +