Update Potlatch 2 to r24423 build

This commit is contained in:
Tom Hughes 2010-11-27 00:05:36 +00:00
parent 6bdc86dd33
commit 57a1ae7048
8 changed files with 41 additions and 17 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -9,62 +9,57 @@
<name>OSM - Osmarender</name> <name>OSM - Osmarender</name>
<url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url> <url>http://tah.openstreetmap.org/Tiles/tile/$z/$x/$y.png</url>
</set> </set>
<set> <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
<name>OS OpenData Streetview</name> <name>OS OpenData Streetview</name>
<url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url> <url>http://os.openstreetmap.org/sv/$z/$x/$y.png</url>
<sourcetag>OS OpenData StreetView</sourcetag> <sourcetag>OS OpenData StreetView</sourcetag>
</set> </set>
<set> <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
<name>OS OpenData Locator</name> <name>OS OpenData Locator</name>
<url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url> <url>http://tiles.itoworld.com/os_locator/$z/$x/$y.png</url>
<sourcetag>OS OpenData Locator</sourcetag> <sourcetag>OS OpenData Locator</sourcetag>
</set> </set>
<set> <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
<name>OS 1:25k historic</name> <name>OS 1:25k historic</name>
<url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url> <url>http://ooc.openstreetmap.org/os1/$z/$x/$y.png</url>
<sourcetag>OS 1:25k</sourcetag> <sourcetag>OS 1:25k</sourcetag>
</set> </set>
<set> <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
<name>OS 7th Series historic</name> <name>OS 7th Series historic</name>
<url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url> <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
<sourcetag>OS7</sourcetag> <sourcetag>OS7</sourcetag>
</set> </set>
<set> <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">
<name>OS New Popular Edition historic</name> <name>OS New Popular Edition historic</name>
<url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url> <url>http://ooc.openstreetmap.org/npe/$z/$x/$y.png</url>
<sourcetag>NPE</sourcetag> <sourcetag>NPE</sourcetag>
</set> </set>
<set> <set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
<name>OS Scottish Popular historic</name> <name>OS Scottish Popular historic</name>
<url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url> <url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
<sourcetag>NPE</sourcetag> <sourcetag>NPE</sourcetag>
</set> </set>
<set> <set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">
<name>Surrey aerial</name> <name>Surrey aerial</name>
<url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url> <url>http://gravitystorm.dev.openstreetmap.org/surrey/$z/$x/$y.png</url>
<sourcetag>Surrey aerial</sourcetag> <sourcetag>Surrey aerial</sourcetag>
</set> </set>
<set> <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
<name>NearMap aerial</name>
<url>http://www.nearmap.com/maps/nml=Vert&amp;zxy=$z,$x,$y</url>
<sourcetag>NearMap</sourcetag>
</set>
<set>
<name>Haiti - GeoEye Jan 13</name> <name>Haiti - GeoEye Jan 13</name>
<url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url> <url>http://gravitystorm.dev.openstreetmap.org/imagery/haiti/$z/$x/$y.jpg</url>
<sourcetag>Haiti GeoEye</sourcetag> <sourcetag>Haiti GeoEye</sourcetag>
</set> </set>
<set> <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
<name>Haiti - GeoEye Jan 13+</name> <name>Haiti - GeoEye Jan 13+</name>
<url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url> <url>http://maps.nypl.org/tilecache/1/geoeye/$z/$x/$y.jpg</url>
<sourcetag>Haiti GeoEye</sourcetag> <sourcetag>Haiti GeoEye</sourcetag>
</set> </set>
<set> <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
<name>Haiti - DigitalGlobe</name> <name>Haiti - DigitalGlobe</name>
<url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url> <url>http://maps.nypl.org/tilecache/1/dg_crisis/$z/$x/$y.jpg</url>
<sourcetag>Haiti DigitalGlobe</sourcetag> <sourcetag>Haiti DigitalGlobe</sourcetag>
</set> </set>
<set> <set minlat="17.95" minlon="-74.5" maxlat="20.12" maxlon="-71.58">
<name>Haiti - Street names</name> <name>Haiti - Street names</name>
<url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url> <url>http://hypercube.telascience.org/tiles/1.0.0/haiti-city/$z/$x/$y.jpg</url>
<sourcetag>Haiti streetnames</sourcetag> <sourcetag>Haiti streetnames</sourcetag>

View file

@ -52,7 +52,7 @@ 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=path] { color: brown; width: 2; dashes: 2, 2; set .path;}
way[highway=cycleway] { color: Blue; width: 2; dashes: 4, 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[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;} way .path {text:name; text-color: black; text-position: offset; text-offset: 5;}
/* Could be improved */ /* Could be improved */
way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; } way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; }

Binary file not shown.

View file

@ -17,4 +17,8 @@
<name>GPS</name> <name>GPS</name>
<url>gpx.css</url> <url>gpx.css</url>
</stylesheet> </stylesheet>
<stylesheet>
<name>Bugs</name>
<url>bugs.css</url>
</stylesheet>
</stylesheets> </stylesheets>

View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<vectors>
<set loaded="true">
<name>Mapdust Bugs</name>
<loader>BugLoader</loader>
<url>http://www.mapdust.com/api/</url>
<apikey>e4d47b6b8c26e822a62d747b802f98ac</apikey>
</set>
<set>
<name>Bike Shop Locator - Missing Shops</name>
<loader>BikeShopLoader</loader>
<url>http://shaunmcdonald.dev.openstreetmap.org/bike-shop-locator/</url>
</set>
<set>
<name>Everyone's GPS tracks</name>
<loader>TrackLoader</loader>
<!-- doesn't need a URL -->
</set>
<set disabled="true">
<name>A particular GPX file</name>
<loader>GPXImporter</loader>
<url></url>
</set>
</vectors>