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 cfeb3cbf7ca26330845f6e439e2a5f2b806123ed..2ed7dd2f82905c92a527c0796437a15a8a6a9649 100644 (file)
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 2f8f4a7486cd6aa867757902662a69ad776ad6bf..c6752149ba6a15ba4683d836ce50673ddcf5a236 100644 (file)
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 e0b896318520ed7526ea3aaf04b48931731b71c9..443c7f6ecc551a87899e7eee6b4898f6094cc9ed 100644 (file)
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 55003470fc98329cff6ceb64b3a3f3f9971c9f03..fb5e8dc786e87a4e04de7db67e0492779174af72 100644 (file)
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 bd1d4b0b2796857cea286aadc5fb8238c01e5114..7876a5c8fe853feddf45c9ba75fec332b94dbdec 100644 (file)
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 a8bee6ba090f75c75190b3b56125af45054f8908..1a3022ea948aeb022300aecfc8f930d724bae45d 100644 (file)
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 (file)
index 0000000..ef94427
--- /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 d9a817491edb61f10304a8ea13b9336f7976ec39..3d260d45d220902666b9499767760ff8a4f47ec6 100644 (file)
--- a/public/potlatch2/vectors.xml
+++ b/public/potlatch2/vectors.xml
@@ -14,7 +14,7 @@
       <url>http://80.242.147.84/osmbugs/api/</url>
       <apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
     </set>
-    <set>
+    <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
       <name>Bike Shop Locator - Missing Shops</name>
       <loader>BikeShopLoader</loader>
       <url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url>
@@ -25,9 +25,9 @@
       <!-- doesn't need a URL -->
     </set>
     <set disabled="true">
-      <name>A particular GPX file</name>
-      <loader>GPXImporter</loader>
-      <policyfile>http://gravitystorm.dev.openstreetmap.org/gpx/crossdomain.xml</policyfile>
-      <url>http://gravitystorm.dev.openstreetmap.org/gpx/112.gpx</url>
+      <name>CNXC</name>
+      <loader>SnapshotLoader</loader>
+      <policyfile>http://localhost:3000/crossdomain.xml</policyfile>
+      <url>http://localhost:3000/api/</url>
     </set>
-</vectors>
\ No newline at end of file
+</vectors>