Update Potlatch 2 to 2.3-224-g2df4b28 build

This commit is contained in:
Tom Hughes 2012-03-12 20:27:32 +00:00
parent d07680a085
commit 7575f1ec0a
38 changed files with 28 additions and 1 deletions

View file

@ -2,15 +2,23 @@ module Potlatch2
LOCALES = {
"ast" => "ast",
"br" => "br",
"ca" => "ca",
"de" => "de_DE",
"en" => "en_US",
"en-GB" => "en_GB",
"es" => "es_ES",
"fa" => "fa",
"fi" => "fi",
"fr" => "fr_FR",
"ga" => "ga",
"gl" => "gl",
"he" => "he",
"hsb" => "hsb",
"hu" => "hu",
"ia" => "ia",
"ja" => "ja_JP",
"ka" => "ka",
"lb" => "lb",
"mk" => "mk",
"ms" => "ms",
"nb" => "nb_NO",
@ -20,7 +28,9 @@ module Potlatch2
"pl" => "pl_PL",
"ru" => "ru",
"sq" => "sq",
"ta" => "ta",
"tr" => "tr",
"uk" => "uk",
"vi" => "vi_VN",
"zh" => "zh_CN"
}

View file

@ -136,4 +136,9 @@
<url>http://irs.gis-lab.info/?layers=spot&request=GetTile&z=$z&x=$x&y=$y</url>
<sourcetag>Kosmosnimki.ru SPOT4</sourcetag>
</set>
<set minlon="96" minlat="-44" maxlon="168" maxlat="-9">
<name>Australia - Geographic Reference Image</name>
<url>http://agri.openstreetmap.org/$z/$x/$y.png</url>
<sourcetag>AGRI</sourcetag>
</set>
</imagery>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -282,6 +282,7 @@
<area/>
<tag k="leisure" v="park"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
@ -291,6 +292,7 @@
<area/>
<tag k="landuse" v="forest"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
@ -300,6 +302,7 @@
<area/>
<tag k="landuse" v="meadow"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
</featureGroup>

View file

@ -305,6 +305,15 @@
<inputSet ref="names"/>
<input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
<input type="number" minimum="0" maximum="99999" stepSize="1" presence="always" category="Parking" name="Capacity" key="capacity" description="The number of cars that can be parked in the car park"/>
<input type="choice" presence="always" category="Parking" name="Type" key="parking" priority="high">
<choice value="surface" text="Surface (outdoor)" />
<choice value="multi-storey" text="Multi-storey" />
<choice value="underground" text="Underground" />
<choice value="garage" text="Garage" />
<choice value="park_and_ride" text="Park-and-ride" />
<choice value="garage_boxes" text="Garage boxes" />
</input>
<input type="freetext" presence="onTagMatch" category="Parking" name="Maximum stay" key="maxstay" description="The maximum permitted duration of parking (eg, 4h)."/>
<inputSet ref="fee"/>
<inputSet ref="common"/>
</feature>

Binary file not shown.

View file

@ -12,7 +12,7 @@ way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-col
/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
way[leisure] :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[historic] :area,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],