Update Potlatch 2 to 2.3-367-ga54da3b build

diff --git a/public/potlatch2/features/natural__beach.png b/public/potlatch2/features/natural__beach.png
new file mode 100644 (file)
index 0000000..5846d19
Binary files /dev/null and b/public/potlatch2/features/natural__beach.png differ

diff --git a/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png b/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png
new file mode 100644 (file)
index 0000000..243d6e6
Binary files /dev/null and b/public/potlatch2/features/pois/health_veterinary.n.8E7409.24.png differ

diff --git a/public/potlatch2/features/pois/transport_zebracrossing.n.24.png b/public/potlatch2/features/pois/transport_zebracrossing.n.24.png
new file mode 100644 (file)
index 0000000..21e0c77
Binary files /dev/null and b/public/potlatch2/features/pois/transport_zebracrossing.n.24.png differ

diff --git a/public/potlatch2/locales/ast.swf b/public/potlatch2/locales/ast.swf
index 10e2d8ee77ff7400f2aa04b4b7b4c1188aa076b4..b29259800079748189117eb244789da9ae5a2b5e 100644 (file)
Binary files a/public/potlatch2/locales/ast.swf and b/public/potlatch2/locales/ast.swf differ

diff --git a/public/potlatch2/locales/br.swf b/public/potlatch2/locales/br.swf
index d7a0b52ef10745810f2f6972cebe31de5c77aa8c..26fcbfd8b065d4b3edffbf70df2e8d0890656ad8 100644 (file)
Binary files a/public/potlatch2/locales/br.swf and b/public/potlatch2/locales/br.swf differ

diff --git a/public/potlatch2/locales/ca.swf b/public/potlatch2/locales/ca.swf
index 9c4431fb779b218c297c1a101bdca2f21d13945e..a33aea7821337215952b8a8156b9178f2879187b 100644 (file)
Binary files a/public/potlatch2/locales/ca.swf and b/public/potlatch2/locales/ca.swf differ

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index a40e2c8bb8155afe2533b17678545e9f386b6b0f..43e5e701d4c95fc4e73bca1946499a3d837b3a97 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 f25fb040dc3b58764fd7ead5bd60e51b807ad3c3..c142e1fe160af96ecb17fea1699fc957dc2a5d08 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 3174cd9ac04499cd5622cce3ba44c154cf4ea475..02b5ee59cd421e49e9ca9c67c990490500bca0ff 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/es_ES.swf b/public/potlatch2/locales/es_ES.swf
index c6a7bcd22bb9e0adee65169e0f265cd28e07f4d1..7005ee1be2433eecd87e6c2d74daf1d3e4dcd8af 100644 (file)
Binary files a/public/potlatch2/locales/es_ES.swf and b/public/potlatch2/locales/es_ES.swf differ

diff --git a/public/potlatch2/locales/fa.swf b/public/potlatch2/locales/fa.swf
index c3c4b18beda1edceb76369e6bddd10365901f3ad..f8f1f7c6466cc37af94bd639452a95bde3e18854 100644 (file)
Binary files a/public/potlatch2/locales/fa.swf and b/public/potlatch2/locales/fa.swf differ

diff --git a/public/potlatch2/locales/fi.swf b/public/potlatch2/locales/fi.swf
index 52ea7457b0036b067383aff60d1cf54f8016f46a..d4c3792d17f81ebf1e68746d135933e55a4b3848 100644 (file)
Binary files a/public/potlatch2/locales/fi.swf and b/public/potlatch2/locales/fi.swf differ

diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index 6efb0df1bd9aaca6c3ed7250dc178bcee3071cdc..4c2249b02c59bb6ef5916a1c002a4486413f69a1 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/ga.swf b/public/potlatch2/locales/ga.swf
index 0972b034757ae6499c56882ef77ed92137c3913d..ec1444e633486f27ed93c96a3967204d71a826fc 100644 (file)
Binary files a/public/potlatch2/locales/ga.swf and b/public/potlatch2/locales/ga.swf differ

diff --git a/public/potlatch2/locales/gl.swf b/public/potlatch2/locales/gl.swf
index c9194cbac8bbd76bf0ca67d7c9c92fc937c5ebd1..8250b1fb4d7bce7c65bdef92132c5198b6669373 100644 (file)
Binary files a/public/potlatch2/locales/gl.swf and b/public/potlatch2/locales/gl.swf differ

diff --git a/public/potlatch2/locales/he.swf b/public/potlatch2/locales/he.swf
index 62d02ad50703231a13e7270fd4155234e69a1793..a6061a9d105b6d7bf23ecdfea34f512e54c8026c 100644 (file)
Binary files a/public/potlatch2/locales/he.swf and b/public/potlatch2/locales/he.swf differ

diff --git a/public/potlatch2/locales/hsb.swf b/public/potlatch2/locales/hsb.swf
index 97df421660e466345a926220e16c4d1855a6314c..fc3136cf248b3ed6c2d72c04595c52c5777916d8 100644 (file)
Binary files a/public/potlatch2/locales/hsb.swf and b/public/potlatch2/locales/hsb.swf differ

diff --git a/public/potlatch2/locales/hu.swf b/public/potlatch2/locales/hu.swf
index faf12e114e7539febd89748b4c79f09d89c853dd..387ee3c63df10ca1d05a8318ed74d5682e71b775 100644 (file)
Binary files a/public/potlatch2/locales/hu.swf and b/public/potlatch2/locales/hu.swf differ

diff --git a/public/potlatch2/locales/ia.swf b/public/potlatch2/locales/ia.swf
index 4a1bfee1b8add67939875faf3355235cb5e4f90e..2bd6bc07719f004bf6446dd8ae5c42b0c394e0f1 100644 (file)
Binary files a/public/potlatch2/locales/ia.swf and b/public/potlatch2/locales/ia.swf differ

diff --git a/public/potlatch2/locales/ja_JP.swf b/public/potlatch2/locales/ja_JP.swf
index c8d18f6c022b7c91f415c13b02127b1f4437efa1..f621e9ec4988498860920c3a623425259af1d9a5 100644 (file)
Binary files a/public/potlatch2/locales/ja_JP.swf and b/public/potlatch2/locales/ja_JP.swf differ

diff --git a/public/potlatch2/locales/ka.swf b/public/potlatch2/locales/ka.swf
index 559d9a358f9ac878077cae9929b9f25b072e5c7d..70b1a9517c5fedae2802e0012fc5de5a213511f9 100644 (file)
Binary files a/public/potlatch2/locales/ka.swf and b/public/potlatch2/locales/ka.swf differ

diff --git a/public/potlatch2/locales/lb.swf b/public/potlatch2/locales/lb.swf
index 305c13e8c4ddeefd93a564f5565e493f08cf92ce..fdb6de7a03bf5af9e1b2e4e9568529ed2ed4e9d4 100644 (file)
Binary files a/public/potlatch2/locales/lb.swf and b/public/potlatch2/locales/lb.swf differ

diff --git a/public/potlatch2/locales/mk.swf b/public/potlatch2/locales/mk.swf
index aaac7c3853777c84efc5f0155c73aa7968893d31..a402d00b9fe6c4e73569363e5c918bd0ff853deb 100644 (file)
Binary files a/public/potlatch2/locales/mk.swf and b/public/potlatch2/locales/mk.swf differ

diff --git a/public/potlatch2/locales/ms.swf b/public/potlatch2/locales/ms.swf
index 17a77c5522496bce4781ec67bb63c190b1722f42..240c96a1ad3e013fcdbf5d24d1ce3da14ea7ac0d 100644 (file)
Binary files a/public/potlatch2/locales/ms.swf and b/public/potlatch2/locales/ms.swf differ

diff --git a/public/potlatch2/locales/nb_NO.swf b/public/potlatch2/locales/nb_NO.swf
index 556b3fde3a1fe9b9b1ebecd143fd202693df1028..6cc57f4cf96398f0747aa874adf94cdd1a698372 100644 (file)
Binary files a/public/potlatch2/locales/nb_NO.swf and b/public/potlatch2/locales/nb_NO.swf differ

diff --git a/public/potlatch2/locales/nl_NL.swf b/public/potlatch2/locales/nl_NL.swf
index a73e0eb4e08a809aaecb5a6cfbe66671afe85eb3..232125143d18b74b758666b1757e648c6c2d32c3 100644 (file)
Binary files a/public/potlatch2/locales/nl_NL.swf and b/public/potlatch2/locales/nl_NL.swf differ

diff --git a/public/potlatch2/locales/nn_NO.swf b/public/potlatch2/locales/nn_NO.swf
index 806d814bb5ad0d4dc3760bde16458536644fa1c6..70679680de2d8288f9484ab0041972c6247be30c 100644 (file)
Binary files a/public/potlatch2/locales/nn_NO.swf and b/public/potlatch2/locales/nn_NO.swf differ

diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index b28fa24e6dd3653bac9f7098d5c703596157a67b..f4956b68df4b2e17ebb7480a9446abcb0b098b22 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/locales/ru.swf b/public/potlatch2/locales/ru.swf
index c12907b651c3eb00ba2f0227975593f011c8673b..d0bbf21ab60f871501091775a1f1e05873457abd 100644 (file)
Binary files a/public/potlatch2/locales/ru.swf and b/public/potlatch2/locales/ru.swf differ

diff --git a/public/potlatch2/locales/sq.swf b/public/potlatch2/locales/sq.swf
index 8bbe09e0279e9d3992c8fa51618ccb86ac9a1b9d..af3d4b0444d8d2b46ad3e86f5cc75b211ae1c742 100644 (file)
Binary files a/public/potlatch2/locales/sq.swf and b/public/potlatch2/locales/sq.swf differ

diff --git a/public/potlatch2/locales/ta.swf b/public/potlatch2/locales/ta.swf
index 7af99320ff5b90126ab476ca0238de78bc764083..61f2ab178dbc36ef4542c493c4e6d49b3a5ae8ac 100644 (file)
Binary files a/public/potlatch2/locales/ta.swf and b/public/potlatch2/locales/ta.swf differ

diff --git a/public/potlatch2/locales/tr.swf b/public/potlatch2/locales/tr.swf
index 60a6cb3fc564b33bae5c1b34301dd08ae072f890..7b966cffa946a3c5b3fc09f809dd0be9f4a62161 100644 (file)
Binary files a/public/potlatch2/locales/tr.swf and b/public/potlatch2/locales/tr.swf differ

diff --git a/public/potlatch2/locales/uk.swf b/public/potlatch2/locales/uk.swf
index f7c96d521cc1f28ecf15a319cdc37ee9c7446b1d..57aae133636e08c3a52a48e769f74e5371ae0d85 100644 (file)
Binary files a/public/potlatch2/locales/uk.swf and b/public/potlatch2/locales/uk.swf differ

diff --git a/public/potlatch2/locales/vi_VN.swf b/public/potlatch2/locales/vi_VN.swf
index a74bcea7ebbdff8e74ab72d60a8ce0a0320691b9..8390be29e210a110c3865b4102c209665017d5dc 100644 (file)
Binary files a/public/potlatch2/locales/vi_VN.swf and b/public/potlatch2/locales/vi_VN.swf differ

diff --git a/public/potlatch2/locales/zh_CN.swf b/public/potlatch2/locales/zh_CN.swf
index 0a23a91f0a8da180fecdecf8ed958340013e372c..8998799ab2bef10a5f0c9be5eec8b1b24fddc890 100644 (file)
Binary files a/public/potlatch2/locales/zh_CN.swf and b/public/potlatch2/locales/zh_CN.swf differ

diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 2e296e964d95a5e66d6599169336ad37c7c3f50d..fbc4a39864913cedb4698693a3b41a38e47b75c3 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -48,7 +48,7 @@
    </inputSet> 
 
   <inputSet id="source">
    </inputSet> 
 
   <inputSet id="source">

-    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>
+    <input type="freetext" category="Details" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Bing, ...)" priority="lowest"/>

   </inputSet>
 
   <inputSet id="designation">
   </inputSet>
 
   <inputSet id="designation">


@@ -142,6 +142,7 @@
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>

+    <inputSet ref="tram-route"/>

     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
     <inputSet ref="roadRoundabout"/>
     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
     <inputSet ref="roadRoundabout"/>


@@ -156,6 +157,7 @@
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>
     <inputSet ref="cycle"/>
     <inputSet ref="bicycle-lane"/>
     <inputSet ref="bus-route"/>

+    <inputSet ref="tram-route"/>

     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
     <inputSet ref="roadRoundabout"/>
     <inputSet ref="pedestrians"/>
     <inputSet ref="roadLanes"/>
     <inputSet ref="roadRoundabout"/>


@@ -267,6 +269,7 @@
       <choice value="750" text="750V"/>
       <choice value="1500" text="1500V"/>
       <choice value="3000" text="3000V"/>
       <choice value="750" text="750V"/>
       <choice value="1500" text="1500V"/>
       <choice value="3000" text="3000V"/>

+      <choice value="12000" text="12kV"/>

       <choice value="15000" text="15kV"/>
       <choice value="25000" text="25kV"/>
     </input>
       <choice value="15000" text="15kV"/>
       <choice value="25000" text="25kV"/>
     </input>


@@ -315,6 +318,13 @@
       <role role="via"/>
     </input>
   </inputSet>
       <role role="via"/>
     </input>
   </inputSet>

+  
+  <inputSet id="trafficSignals">
+    <!-- can't add as standalone feature due to current limitations, would conflict with junction node feature -->
+    <input type="choice" key="highway" name="Traffic signals" description="Intersection controlled by traffic lights" category="Restrictions" presence="always">
+      <choice value="traffic_signals" text="Yes"/>
+    </input>
+  </inputSet>

 
   <inputSet id="pedestrians">
     <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot">
 
   <inputSet id="pedestrians">
     <input type="choice" name="Pedestrians" description="Can pedestrians use this road, including footpaths if any?" category="Walk" key="foot">


@@ -368,6 +378,16 @@
     </input>
   </inputSet>
 
     </input>
   </inputSet>
 

+  <inputSet id="train-route">
+    <input type="route" name="Train Route" description="Train route" category="Transport" priority="low" presence="onTagMatch">
+      <match k="type" v="route"/>
+      <match k="route" v="train"/>
+      <icon image="features/transport__railway.png">
+        <font size="12pt">${name|operator} <b>(${ref})</b></font>
+      </icon>
+    </input>
+  </inputSet>
+

   <inputSet id="cycle">
     <inputSet ref="bicycle-permission"/>
     <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">
   <inputSet id="cycle">
     <inputSet ref="bicycle-permission"/>
     <input type="route" name="National Cycle Routes" description="A signposted route in a National Cycle Network, or nearest equivalent." category="Cycle" priority="low">


@@ -503,14 +523,18 @@
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
 

-    <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are cars and other private vehicles allowed?">
+    <inputSet ref="hores-permission" />
+
+  </inputSet>
+
+  <inputSet id="horse-permission">
+    <input type="choice" name="Horses" category="Restrictions" key="horse" description="Are horses allowed?">

       <choice value="yes" text="Allowed" description="General right of way."/>
       <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>
       <choice value="yes" text="Allowed" description="General right of way."/>
       <choice value="no" text="Prohibited" description="No access to the public."/>
       <choice value="permissive" text="Permissive" description="Access permitted through private land."/>
       <choice value="private" text="Private" description="No access to the public, except individual exceptions."/>
       <choice value="designated" text="Designated" description="Permitted, according to signs or specific local laws."/>
     </input>

-

   </inputSet>
 
   <inputSet id="places">
   </inputSet>
 
   <inputSet id="places">


@@ -582,9 +606,10 @@
       <choice value="35000" text="35 kV"/>
       <choice value="110000" text="110 kV"/>
       <choice value="132000" text="132 kV"/>
       <choice value="35000" text="35 kV"/>
       <choice value="110000" text="110 kV"/>
       <choice value="132000" text="132 kV"/>

-      <choice value="138000" text="238 kV"/>
+      <choice value="138000" text="138 kV"/>

       <choice value="220000" text="220 kV"/>
       <choice value="380000" text="380 kV"/>
       <choice value="220000" text="220 kV"/>
       <choice value="380000" text="380 kV"/>

+      <choice value="500000" text="500 kV"/>

     </input>
   </inputSet>
 
     </input>
   </inputSet>
 


@@ -625,6 +650,14 @@
       <choice value="volleyball" text="Volleyball"/>
     </input>
   </inputSet>
       <choice value="volleyball" text="Volleyball"/>
     </input>
   </inputSet>

+  
+  <inputSet id="wheelchair-basic">
+    <input type="choice" name="Wheelchair" key="wheelchair" presence="onTagMatch" category="Details">
+      <choice value="yes" text="Yes: ramps/elevators/etc" />
+      <choice value="no" text="No: inaccessible to wheelchairs" />
+      <choice value="limited" text="Limited accessibility" />
+    </input>
+  </inputSet>      

 
 <!-- Features -->
 
 
 <!-- Features -->
 

diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index 3dbd64a9d91a6673541ea560fd3da3b279af947e..318ea6156559e0a60c826cc463ec2406da657495 100644 (file)
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -52,6 +52,20 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

+  <feature name="Veterinarian">
+    <category>amenity</category>
+    <icon image="features/pois/health_veterinary.n.8E7409.24.png">
+      ${name}
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dveterinary</help>
+    <point/>
+    <area/>
+    <tag k="amenity" v="veterinary"/>
+    <inputSet ref="names"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <inputSet ref="common"/>
+  </feature>

 
   <feature name="Place of Worship">
     <category>amenity</category>
 
   <feature name="Place of Worship">
     <category>amenity</category>


@@ -74,7 +88,6 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-

   <feature name="ATM">
     <category>amenity</category>
     <icon image="features/pois/money_atm.n.24.png"/>
   <feature name="ATM">
     <category>amenity</category>
     <icon image="features/pois/money_atm.n.24.png"/>


@@ -315,12 +328,12 @@
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>

-      <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
-        <choice value="picnic_shelter" text="Picnic shelter"/>
-        <choice value="public_transport" text="Public transport"/>
-        <choice value="weather_shelter" text="Weather shelter"/>
-        <choice value="wildlife_hide" text="Wildlife hide"/>
-      </input>
+    <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
+      <choice value="picnic_shelter" text="Picnic shelter"/>
+      <choice value="public_transport" text="Public transport"/>
+      <choice value="weather_shelter" text="Weather shelter"/>
+      <choice value="wildlife_hide" text="Wildlife hide"/>
+    </input>

     <inputSet ref="names"/>
     <inputSet ref="common"/>
   </feature>
     <inputSet ref="names"/>
     <inputSet ref="common"/>
   </feature>


@@ -381,8 +394,15 @@
     <point/>
     <area/>
     <tag k="amenity" v="swimming_pool"/>
     <point/>
     <area/>
     <tag k="amenity" v="swimming_pool"/>

+    <tag k="sport" v="swimming"/>

     <inputSet ref="simpleName"/>    
     <inputSet ref="common"/>
     <inputSet ref="simpleName"/>    
     <inputSet ref="common"/>

+    <inputSet ref="permissions"/>
+    <input type="choice" presence="always" name="Indoor" key="covered" description="Indoor or outdoor?">
+      <choice value="yes" text="Indoor"/>
+      <choice value="no" text="Outdoor"/>
+    </input>
+    <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The organisation that runs the swimming pool." />    

 
   </feature>
 
 
   </feature>
 


@@ -489,5 +509,5 @@
     <inputSet ref="cuisine"/>
     <inputSet ref="common"/>
   </feature>
     <inputSet ref="cuisine"/>
     <inputSet ref="common"/>
   </feature>

-
+  

 </featureGroup>
\ No newline at end of file
 </featureGroup>
\ No newline at end of file

diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 915a6dce67bde6bf61e2fe89024193528938952a..e2e51d8453af70498934c1bd247a17090a186a88 100644 (file)
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -123,6 +123,28 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

+  <feature name="Beach">
+    <category>natural</category>
+    <icon image="features/natural__beach.png"/>
+    <area/>
+    <tag k="natural" v="beach"/>
+    <input type="choice" presence="always" category="Details" name="Beach surface" key="surface" description="What material is the ground mostly?">
+      <choice value="sand" text="Sand"/>
+      <choice value="pebbles" text="Pebbles"/>
+      <choice value="stone" text="Pebbles"/>
+      <choice value="rocky" text="Rocky"/>
+    </input>
+    <input type="choice" presence="always" category="Details" name="Access" key="access" description="Accessible to the public?">
+      <choice value="yes" text="Public access"/>
+      <choice value="permissive" text="Privately owned, but publicly accessible"/>
+      <choice value="private" text="Private access only"/>
+    </input>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="Operator" description="Organisation that manages or owns the beach.">
+    </input>
+    
+    <inputSet ref="simpleName"/>
+    <inputSet ref="common"/>
+  </feature>

 
 
 
 
 
 

diff --git a/public/potlatch2/map_features/roads.xml b/public/potlatch2/map_features/roads.xml
index 8fe62ba82a8027e67761d7cce86e918627f259bf..b731d6dd2289a062d7f6becce365c029ad174e86 100644 (file)
--- a/public/potlatch2/map_features/roads.xml
+++ b/public/potlatch2/map_features/roads.xml
@@ -302,6 +302,28 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

+  <feature name="Pedestrian crossing">
+    <category>transport</category>
+    <icon image="features/pois/transport_zebracrossing.n.24.png"/>
+    <point />
+    <within entity="way" k="highway"/>
+    <tag k="highway" v="crossing"/>
+    <input type="choice" key="crossing" name="Type of crossing" presence="always">
+      <choice value="yes" text="Generic" vmatch="unknown" />
+      <choice value="uncontrolled" text="Uncontrolled (no lights)" />
+      <choice value="traffic_signals" text="Traffic lights" />
+      <choice value="island" text="Traffic island" />
+      <choice value="unmarked" text="Unmarked" />
+      <choice value="no" text="None" />
+    </input>
+    <inputSet ref="common"/>
+    <inputSet ref="bicycle-permission"/>
+    <inputSet ref="horse-permission"/>
+    <input type="checkbox" key="supervised" name="Supervised by crossing guard" category="Details" presence="onTagMatch" />
+    <input type="checkbox" key="segregated" name="Horses, pedestrians etc segregated from each other" category="Details" presence="onTagMatch" />
+    <input type="freetext" key="crossing_ref" name="Crossing category reference"  category="Details" presence="onTagMatch" />
+  </feature>
+

   <feature name="Turn restriction">
     <category>advanced</category>
     <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>
   <feature name="Turn restriction">
     <category>advanced</category>
     <help>http://wiki.openstreetmap.org/wiki/Turn_restrictions</help>


@@ -329,13 +351,14 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

-  
+    

   <!-- Junction nodes (for turn restrictions) -->
 
   <!-- Junction nodes (for turn restrictions) -->
 

-  <feature>
+  <feature name="Intersection">

     <point/>
     <within entity="way" k="highway" minimum="2"/>
     <inputSet ref="junctionNode"/>
     <point/>
     <within entity="way" k="highway" minimum="2"/>
     <inputSet ref="junctionNode"/>

+    <inputSet ref="trafficSignals"/>    

     <inputSet ref="common"/>
   </feature>
   
     <inputSet ref="common"/>
   </feature>
   

diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index 2dba71d95025fa50d063d7caf65702f0ffabf4bb..a6462be6d90e6bffd3b64ba2a290318fb377eb28 100644 (file)
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -14,6 +14,8 @@
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>
+        

       </feature>
     
     
       </feature>
     
     


@@ -29,6 +31,7 @@
         <tag k="railway" v="rail"/>
         <tag k="service" v="spur"/>
         <inputSet ref="common"/>
         <tag k="railway" v="rail"/>
         <tag k="service" v="spur"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -44,6 +47,7 @@
         <tag k="railway" v="rail"/>
         <tag k="service" v="siding"/>
         <inputSet ref="common"/>
         <tag k="railway" v="rail"/>
         <tag k="service" v="siding"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -56,6 +60,7 @@
         <line/>
         <tag k="railway" v="preserved"/>
         <inputSet ref="common"/>
         <line/>
         <tag k="railway" v="preserved"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -70,6 +75,7 @@
         <line/>
         <tag k="railway" v="disused"/>
         <inputSet ref="common"/>
         <line/>
         <tag k="railway" v="disused"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -82,6 +88,7 @@
         <line/>
         <tag k="railway" v="abandoned"/>
         <inputSet ref="common"/>
         <line/>
         <tag k="railway" v="abandoned"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -100,6 +107,8 @@
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>

+        <inputSet ref="tram-route"/>
+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -111,7 +120,7 @@
     
         <line/>
         <tag k="railway" v="tram"/>
     
         <line/>
         <tag k="railway" v="tram"/>

-        <input ref="tram-route"/>
+        <inputSet ref="tram-route"/>

         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
         <inputSet ref="embankment-cutting"/>


@@ -135,6 +144,7 @@
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
         <inputSet ref="embankment-cutting"/>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>

+        <inputSet ref="train-route"/>

       </feature>
     
     
       </feature>
     
     


@@ -356,6 +366,8 @@
     <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/>
     <input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/>
     <inputSet ref="common"/>
     <input type="freetext" presence="onTagMatch" category="Details" name="Operator" key="operator" description="The provider of the service" priority="low"/>
     <input type="number" minimum="1" maximum="99999" stepSize="1" presence="onTagMatch" category="Details" name="Platforms" key="platforms" description="The number of passenger platforms at the station" priority="low"/>
     <inputSet ref="common"/>

+    <inputSet ref="train-route"/>
+    

   </feature>
 
 
   </feature>
 
 


@@ -535,5 +547,25 @@
     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

+  <feature name="Train Route">
+    <category>transport</category>
+    <icon image="features/transport__railway.png">
+      <font size="12pt">
+        ${name|operator} <b>(${ref})</b>
+      </font>
+    </icon>
+
+    <relation/>
+    <tag k="type" v="route"/>
+    <tag k="route" v="train"/>
+    <input type="freetext" presence="always" category="Details" name="Name" priority="high" key="name" description="Official route name"/>
+    <input type="freetext" presence="always" category="Details" name="Reference" priority="high" key="ref" description="The official reference number"/>
+    <input type="freetext" presence="always" category="Details" name="Network" key="network" description="The network of the train service" priority="high"/>
+    <input type="freetext" presence="always" category="Details" name="Operator" key="operator" description="The provider of the train service" priority="low"/>
+    <input type="freetext" presence="onTagMatch" category="Details" name="Colour code" key="colour" description="Official colour designation for the route, if any." priority="low" />
+    <inputSet ref="source"/>
+    <inputSet ref="wheelchair-basic" />
+  </feature>
+

       
 </featureGroup>
       
 </featureGroup>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index b7ce67708d277f96b6332faafcfb62e2736c8e52..ace217ed4f68f6e3573864f0f6ea6244e6b29a03 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ

diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css
index 3fd9ea777a6d9e638da8ad591e32f663bbb07712..addf821cd0957507971e44df10b17bb26056ae7b 100644 (file)
--- a/public/potlatch2/stylesheets/core_interactive.css
+++ b/public/potlatch2/stylesheets/core_interactive.css
@@ -17,12 +17,12 @@ way :tiger { casing-color: #ff00ff;}
 /* Interactive node behaviour */
 
 node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
 /* Interactive node behaviour */
 
 node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }

-node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
-node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #BBB; casing-color: #333; casing-width: 1; }
-node !:drawn :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
-node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
+node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; }
+node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; }
+node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; }
+node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; }
+node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
+node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }

 node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
 node::selectedNode :selected :background { color: cyan; }
 node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; }
 node::selectedNode :selected :background { color: cyan; }

-node::junctionNode :junction :selectedway { z-index: 8; icon-image: square; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }
+node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; }

diff --git a/public/potlatch2/stylesheets/core_landuse.css b/public/potlatch2/stylesheets/core_landuse.css
index 4dfe9083b6b9fca9e02288a416cff1d78adea9c5..26adf27f9aa3109fdaa0b002e7fdcd460547ba77 100644 (file)
--- a/public/potlatch2/stylesheets/core_landuse.css
+++ b/public/potlatch2/stylesheets/core_landuse.css
@@ -14,13 +14,13 @@ way[leisure] :area                         { color: #8CD6B5; width: 1; fill-colo
 way[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; 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[tourism] :area                          { color: #F7CECE; width: 1; fill-color: #F7CECE; 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[building] :area                         { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; }

 way[natural=water],
 way[natural=water],

-way[waterway][waterway!=dam] :area          { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[waterway][waterway!=dam] :area          { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}

 way[waterway=dam]                                                      { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
 way[man_made] :area                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
 way[waterway=dam]                                                      { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;}
 way[man_made] :area                                                    { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }

-way[man_made=reservoir_covered] :area       { color: blue; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
-way[landuse=reservoir] :area                { color: blue;    width: 2; fill-color: blue;    fill-opacity: 0.2; set .area_small_name;}
+way[man_made=reservoir_covered] :area       { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; }
+way[landuse=reservoir] :area                { color: #3434ff;    width: 2; fill-color: #3434ff;    fill-opacity: 0.2; set .area_small_name;}

 way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
 way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
 way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}
 way[landuse=forest],way[natural=wood] :area { color: green;   width: 2; fill-color: green;   fill-opacity: 0.2; set .area_small_name;}
 way[leisure=park]  :area                    { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;}
 way[leisure=garden]  :area                  { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;}


@@ -31,7 +31,7 @@ way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-col
 way[man_made=pier]                                                     { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
 way[man_made=pier][floating=yes]                       { dashes: 4,2; casing-color: #444;}
 way[leisure=marina] :area                                      { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}
 way[man_made=pier]                                                     { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;}
 way[man_made=pier][floating=yes]                       { dashes: 4,2; casing-color: #444;}
 way[leisure=marina] :area                                      { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;}

-way[leisure=slipway]                                           { color: grey; width: 3; casing-color: blue; casing-width: 2; }
+way[leisure=slipway]                                           { color: grey; width: 3; casing-color: #3434ff; casing-width: 2; }

 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
 /* Perhaps should be filled, on lower zooms. */
 way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
 way[boundary]                               { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
 /* Perhaps should be filled, on lower zooms. */

diff --git a/public/potlatch2/stylesheets/core_pois.css b/public/potlatch2/stylesheets/core_pois.css
index 62d804088ac01fd3d274761157456cd3033a8ea7..439c06c16499c961825c471d5bb78b06948f52d9 100644 (file)
--- a/public/potlatch2/stylesheets/core_pois.css
+++ b/public/potlatch2/stylesheets/core_pois.css
@@ -1,4 +1,4 @@
-node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; z-index: 20; }
+node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; }

 node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
 node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
 node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
 node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; }
 node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; }
 node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }


@@ -6,7 +6,7 @@ node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z
 node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
 node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
 node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }
 node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; }
 node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; }
 node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; }

-node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
 node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
 node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }
 node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; }
 node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; }
 node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; }


@@ -21,13 +21,13 @@ node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-in
 node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
 node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
 node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }
 node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; }
 node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; }
 node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; }

-node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }
 way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; }

-node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
+node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }
 node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; }

-node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; }
+node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }
 node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; }
 node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; }
 node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; }


@@ -56,11 +56,11 @@ node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; }
 node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
 node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
 node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }
 node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; }
 node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; }
 node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; }

-node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }
 node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; }

-node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; z-index: 20; }
-node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
+node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }
+node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
 node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
 node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }
 node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; }
 node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; }
 node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; }


@@ -71,18 +71,18 @@ node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-
 node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
 node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
 node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }
 node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; }
 node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; }
 node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; }

-node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; z-index: 20; }
+node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; z-index: 20; }

 node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
 node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
 node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
 node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
 node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }
 node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; }
 node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; }
 node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; }
 node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; }
 node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; }

-node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; z-index: 20; }
+node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; }

 node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
 node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
 
 /* Addressing */
 
 node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; }
 node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; }
 
 /* Addressing */
 

-node[addr:housenumber],
-node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+node[addr:housenumber] !:drawn,
+node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; }

 way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
 way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}

diff --git a/public/potlatch2/stylesheets/core_ways.css b/public/potlatch2/stylesheets/core_ways.css
index 6c260b0fc964dbe6fb3ba75e9fc94d4979e5e80e..4824facb74a4ae27748e0510491120a24c897f06 100644 (file)
--- a/public/potlatch2/stylesheets/core_ways.css
+++ b/public/potlatch2/stylesheets/core_ways.css
@@ -6,14 +6,13 @@ way[highway=trunk],way[highway=trunk_link],
 way[highway=primary],way[highway=primary_link],
 way[highway=secondary],way[highway=secondary_link],
 way[highway=tertiary],way[highway=tertiary_link],
 way[highway=primary],way[highway=primary_link],
 way[highway=secondary],way[highway=secondary_link],
 way[highway=tertiary],way[highway=tertiary_link],

-way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 10; text-position: line; text-halo-color: white; text-halo-radius: 2; }
-way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 1; }
-way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 1; }
-way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: black; casing-width: 1; }
-way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-width: 1; }
-way[highway=tertiary]                               { z-index: 6; color: #FEFECB; width: 5; casing-width: 1; }
+way[highway=residential],way[highway=unclassified]  { text: name; text-color: black; font-size: 12; text-position: offset; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round }
+way[highway=motorway],way[highway=motorway_link]    { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; }
+way[highway=trunk],way[highway=trunk_link]          { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; }
+way[highway=primary],way[highway=primary_link]      { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; }
+way[highway=secondary],way[highway=secondary_link]  { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; }
+way[highway=tertiary],way[highway=tertiary_link]    { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; }

 way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }
 way[highway=unclassified]                           { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; }

-way[highway=tertiary_link]                          { z-index: 5; color: #FEFECB; width: 4; casing-width: 1; }

 way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
 way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 1; }
 way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }
 way[highway=residential]                            { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; }
 way[highway=service][service!=parking_aisle]        { color: white; width: 3; casing-color: gray; casing-width: 1; }
 way[highway=service][service=parking_aisle]         { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; }


@@ -35,8 +34,7 @@ way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2
 way[highway=track]     { color: #996644; width: 2; dashes: 4, 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=track]     { color: #996644; width: 2; dashes: 4, 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[railway=tram]      { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; }
-way .path              { text:name; text-color: black; text-position: offset; text-offset: 5;}
+way .path              { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; }

 
 /* Under construction */
 
 
 /* Under construction */
 


@@ -45,8 +43,8 @@ way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color
 
 /* Railways */
 
 
 /* Railways */
 

-way[railway=rail] { z-index: 6; color: black; width: 5; }
-way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; }
+way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; }
+way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; }

 
 way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
 way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }
 
 way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;}
 way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; }


@@ -75,8 +73,8 @@ way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; das
 
 way[waterway=river], 
 way[waterway=canal], 
 
 way[waterway=river], 
 way[waterway=canal], 

-way[waterway=stream]   { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;}
-way[waterway=drain]                     {color: blue; width: 1; text:name; text-color: blue; text-position: offset; text-offset: 3;}
+way[waterway=stream]   { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;}
+way[waterway=drain]                     {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;}

 way[waterway][tunnel=yes]                {dashes: 8,4;}
 
 /* Aeroways */
 way[waterway][tunnel=yes]                {dashes: 8,4;}
 
 /* Aeroways */


@@ -126,11 +124,11 @@ way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .are
 /* Physical decoration */
 
 way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); }
 /* Physical decoration */
 
 way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); }

-way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); }
+way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); }

 way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); }
 way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
 /* Attribute decoration */
 
 way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); }
 way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
 
 /* Attribute decoration */
 

-way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }
-way[oneway=-1]::arrows { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows-reversed; }
+way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; }
+way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }

diff --git a/public/potlatch2/stylesheets/gpx.css b/public/potlatch2/stylesheets/gpx.css
index fe08e31acb95ead90565c2bc0989705d7d7eb8b7..8060489206337c153b2ebfd7a7c19c149ebcf260 100644 (file)
--- a/public/potlatch2/stylesheets/gpx.css
+++ b/public/potlatch2/stylesheets/gpx.css
@@ -6,7 +6,7 @@
 
 way { z-index: 2; width: 1; color: cyan; } 
 node :poi { z-index: 2; 
 
 way { z-index: 2; width: 1; color: cyan; } 
 node :poi { z-index: 2; 

-                       icon-image: circle; icon-width: 4; color: orange; 
+                       icon-image: circle; icon-width: 8; color: orange; 

                        casing-color: red; casing-width: 1; 
                        text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
 
                        casing-color: red; casing-width: 1; 
                        text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; }
 

diff --git a/public/potlatch2/stylesheets/opencyclemap.css b/public/potlatch2/stylesheets/opencyclemap.css
index 1270ba26cb15b68096510c46de6562461a20776d..4274f668688ed8f0d3087d2ebc1c3cccba2355e5 100644 (file)
--- a/public/potlatch2/stylesheets/opencyclemap.css
+++ b/public/potlatch2/stylesheets/opencyclemap.css
@@ -72,7 +72,7 @@ way[public_transport=pay_scale_area] :area  { color: gray;    width: 1; fill-col
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
 
 node[addr:housenumber],
 /* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ 
 
 node[addr:housenumber],

-node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; }
+node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; }

 way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
 
 /* POIs, too, can have bitmap icons - they can even be transparent */
 way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;}
 
 /* POIs, too, can have bitmap icons - they can even be transparent */

diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css
index 1598735d859168bcbd083dd9ca34d8a7b3453559..8774333f3cad76cdbd43415fc189e97144a523c3 100644 (file)
--- a/public/potlatch2/stylesheets/potlatch.css
+++ b/public/potlatch2/stylesheets/potlatch.css
@@ -15,7 +15,7 @@
 @import("stylesheets/core_pois.css");
 @import("stylesheets/core_landuse.css");
 @import("stylesheets/core_relations.css");
 @import("stylesheets/core_pois.css");
 @import("stylesheets/core_landuse.css");
 @import("stylesheets/core_relations.css");

-way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
+way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}

 @import("stylesheets/core_interactive.css");
 
 /* Rendering for licence status */
 @import("stylesheets/core_interactive.css");
 
 /* Rendering for licence status */

diff --git a/public/potlatch2/stylesheets/snapshot.css b/public/potlatch2/stylesheets/snapshot.css
index 5450546e3a9cefb52e2699637d78e95b82eb4fe6..891ead6865bcd16598d27701ce19142f1f9462f8 100644 (file)
--- a/public/potlatch2/stylesheets/snapshot.css
+++ b/public/potlatch2/stylesheets/snapshot.css
@@ -8,18 +8,18 @@ way :hover    { z-index: 2; width: 14; color: yellow; linecap: round; }
 way :selected { z-index: 2; width: 14; color: yellow; linecap: round; }
 way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; }
 
 way :selected { z-index: 2; width: 14; color: yellow; linecap: round; }
 way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; }
 

-node :selectedway { z-index: 8; icon-image: circle; icon-width: 8; color: green; }
-node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; }
-node :selected { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: black; casing-width: 1; }
-node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 8; color: green; casing-color: black; casing-width: 1; }
-node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
-node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: black; }
+node :selectedway { z-index: 8; icon-image: circle; icon-width: 16; color: green; }
+node :hoverway { z-index: 9; icon-image: circle; icon-width: 16; color: blue; }
+node :selected { z-index: 9; icon-image: circle; icon-width: 16; color: red; casing-color: black; casing-width: 1; }
+node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 16; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 16; color: black; }
+node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 16; color: black; }

 
 way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; }
 way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; }
 way[_status=complete] { opacity: 0.7; }
 
 way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; }
 way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; }
 way[_status=complete] { opacity: 0.7; }

-node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 12; color: #d95f02; }
-node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 10; color: #1b9e77; opacity: 0.4; }
+node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 24; color: #d95f02; }
+node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 20; color: #1b9e77; opacity: 0.4; }

 node[_status=complete] { opacity: 0.7; }
 
 
 node[_status=complete] { opacity: 0.7; }
 
 

diff --git a/public/potlatch2/stylesheets/wireframe.css b/public/potlatch2/stylesheets/wireframe.css
index 9fbb829cee4834f41fe7283e0646d43e67516130..e3e408ce8cee7f2314e6b70ccb6fb149fa314fb7 100644 (file)
--- a/public/potlatch2/stylesheets/wireframe.css
+++ b/public/potlatch2/stylesheets/wireframe.css
@@ -12,6 +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 :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 !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; }

 node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
 
 node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }