Merge pull request #836 from npct/master

Update production

non_www/tabs/commute/download_national.html

@@ -13,7 +13,7 @@ <h3>National Data - commuting layer</h3>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natcommutezones"></a>Commuting data for zones</h4>
+        <h4><a id="natcommutezones"></a>Commuting data for zones</h4>
         <p>Download the Census 2011 and scenario attribute data for all zones in England and Wales.</p>
         <ul>
           <li>Zones (local authorities)*:
@@ -66,7 +66,7 @@ <h4>Commuting data for flows</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natcommutemsoaflows"></a>MSOA-level flows data</h4>
+        <h4><a id="natcommutemsoaflows"></a>MSOA-level flows data</h4>
         <ul>
           <li>All flows (attribute data only):  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-national/commute/msoa/od_all_attributes.csv" target="_blank" download="od_all_attributes.csv" onclick="ga('send', 'event', 'download', 'commute/od_all_attributes.csv');">csv</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/od_l_rf_codebook.csv" target="_blank" download="od_l_rf_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/od_l_rf_codebook.csv' );">Codebook</a></li>
           <li>Centroids &amp; within-zone travel:  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-national/commute/msoa/c_all.Rds" target="_blank" download="c_all.Rds" onclick="ga('send', 'event', 'download', 'commute/c_all.Rds');">Rds</a> <a href="https://npttile.vs.mythic-beasts.com/pct-outputs-national/commute/msoa/c_all.geojson" target="_blank" download="c_all.geojson" onclick="ga('send', 'event', 'download', 'commute/c_all.geojson');">geojson</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/c_codebook.csv" target="_blank" download="c_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/c_codebook.csv' );">Codebook</a></li>
@@ -77,7 +77,7 @@ <h4><a name="natcommutemsoaflows"></a>MSOA-level flows data</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natcommutelsoaflows"></a>LSOA-level flows data</h4>
+        <h4><a id="natcommutelsoaflows"></a>LSOA-level flows data</h4>
         <ul>
           <li>All flows (attribute data only): <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-national/commute/lsoa/od_all_attributes.csv" target="_blank" download="od_all_attributes.csv" onclick="ga('send', 'event', 'download', 'commute/od_all_attributes.csv');">csv</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/od_l_rf_codebook.csv" target="_blank" download="od_l_rf_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/od_l_rf_codebook.csv');">Codebook</a></li>
           <li>

non_www/tabs/commute/download_region.html

@@ -13,7 +13,7 @@ <h3>Data for <!--region_name-->  - commuting layer</h3>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="regcommutezones"></a>Commuting data for zones</h4>
+        <h4><a id="regcommutezones"></a>Commuting data for zones</h4>
         <p>Download the Census 2011 and scenario data for zones in <!--region_name-->.  These zones include all commuters who <b>live in <!--region_name--></b>.</p>
         <ul>
           <li>
@@ -58,7 +58,7 @@ <h4>Commuting data for flows</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="regcommutemsoaflows"></a>MSOA-level flows data</h4>
+        <h4><a id="regcommutemsoaflows"></a>MSOA-level flows data</h4>
         <ul>
           <li>All flows (attribute data only):  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-regional-notR/commute/msoa/<!--region_url-->/od_attributes.csv" target="_blank" download="od_attributes.csv" onclick="ga('send', 'event', 'download', 'commute/od_attributes.csv');">csv</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/od_l_rf_codebook.csv" target="_blank" download="od_l_rf_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/od_l_rf_codebook.csv');">Codebook</a></li>
           <li>Centroids &amp; within-zone travel:  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-regional-R/commute/msoa/<!--region_url-->/c.Rds" target="_blank" download="c.Rds" onclick="ga('send', 'event', 'download', 'commute/c.Rds');">Rds</a> <a href="https://npttile.vs.mythic-beasts.com/pct-outputs-regional-notR/commute/msoa/<!--region_url-->/c.geojson" target="_blank" download="c.geojson" onclick="ga('send', 'event', 'download', 'commute/c.geojson');">geojson</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/c_codebook.csv" target="_blank" download="c_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/c_codebook.csv');">Codebook</a></li>
@@ -69,7 +69,7 @@ <h4><a name="regcommutemsoaflows"></a>MSOA-level flows data</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="regcommutelsoaflows"></a>LSOA-level flows data</h4>
+        <h4><a id="regcommutelsoaflows"></a>LSOA-level flows data</h4>
         <ul>
           <li>All flows (attribute data only):  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-regional-notR/commute/lsoa/<!--region_url-->/od_attributes.csv" target="_blank" download="od_attributes.csv" onclick="ga('send', 'event', 'download', 'commute/od_attributes.csv');">csv</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/od_l_rf_codebook.csv" target="_blank" download="od_l_rf_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/od_l_rf_codebook.csv');">Codebook</a></li>
           <li>Centroids &amp; within-zone travel:  <a href="https://npttile.vs.mythic-beasts.com/npct-data/pct-outputs-regional-R/commute/lsoa/<!--region_url-->/c.Rds" target="_blank" download="c.Rds" onclick="ga('send', 'event', 'download', 'commute/c.Rds');">Rds</a> <a href="https://npttile.vs.mythic-beasts.com/pct-outputs-regional-notR/commute/lsoa/<!--region_url-->/c.geojson" target="_blank" download="c.geojson" onclick="ga('send', 'event', 'download', 'commute/c.geojson');">geojson</a> -  <a href="https://npct.github.io/pct-shiny/regions_www/www/static/02_codebooks/commute/c_codebook.csv" target="_blank" download="c_codebook.csv" onclick="ga('send', 'event', 'download', 'commute/c_codebook.csv');">Codebook</a></li>

non_www/tabs/school/download_national.html

@@ -13,7 +13,7 @@ <h3>National Data  - school layer</h3>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natschoolzones"></a>School travel data for zones</h4>
+        <h4><a id="natschoolzones"></a>School travel data for zones</h4>
         <p>Download anonymised National School Census 2011 baseline data and scenario attribute data for all zones in England. These files present aggregate data for all children <b>living in a given zone</b></p>
         <p>In the LSOA downloads, baseline and scenario data are not presented for cells containing 1 or 2 children.  Instead these data are set as missing ('NA').  These data are, however, included in the local authority downloads.</p>
         <ul>
@@ -48,7 +48,7 @@ <h4><a name="natschoolzones"></a>School travel data for zones</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natschooldestinations"></a>School travel data for schools</h4>
+        <h4><a id="natschooldestinations"></a>School travel data for schools</h4>
         <p>Download anonymised National School Census 2011 baseline data and scenario data for schools in England. These files present aggregate data for all children <b>attending a given school</b>.</p>
         <p>Baseline and scenario data are not presented for cells containing between 1 and 5 children.  Instead these data are set as missing ('NA').</p>
 
@@ -71,7 +71,7 @@ <h4><a name="natschooldestinations"></a>School travel data for schools</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="natschoolroutenet"></a>School travel data for the route network</h4>
+        <h4><a id="natschoolroutenet"></a>School travel data for the route network</h4>
         <p>Download anonymised National School Census 2011 baseline and scenario cycling estimates for the route network.  This was calculated using all fast routes. It is more complete than the version available via the web browser which excludes route segments with small numbers of cyclists (see the 'Region stats' tab).</p>
         <p>Baseline and scenario data are not presented for route segments containing 1 or 2 cyclists in the NSC 2011.  Instead these data are set as missing ('NA').</p>
         <ul>

non_www/tabs/school/download_region.html

@@ -13,7 +13,7 @@ <h3>Data for <!--region_name-->  - school layer </h3>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="regschoolzones"></a>School travel data for zones</h4>
+        <h4><a id="regschoolzones"></a>School travel data for zones</h4>
         <p>Download anonymised National School Census 2011 baseline data and scenario attribute data for all children who live in <!--region_name-->. These files present aggregate data for all children <b>living in a given zone</b>. </p>
         <p>Baseline and scenario data are not presented for cells containing 1 or 2 children.  Instead these data are set as missing ('NA').</p>
         <ul>
@@ -36,7 +36,7 @@ <h4><a name="regschoolzones"></a>School travel data for zones</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-         <h4><a name="regschooldestinations"></a>School travel data for schools</h4>
+         <h4><a id="regschooldestinations"></a>School travel data for schools</h4>
         <p>Download anonymised National School Census 2011 baseline data and scenario data for schools in <!--region_name-->. These files present aggregate data for all children <b>attending a given school</b>.</p>
         <p>Baseline and scenario data are not presented for cells containing between 1 and 5 children.  Instead these data are set as missing ('NA').</p>
         <ul>
@@ -60,7 +60,7 @@ <h4><a name="regschooldestinations"></a>School travel data for schools</h4>
 
 
      <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="regschoolroutenet"></a>School travel data for the route network</h4>
+        <h4><a id="regschoolroutenet"></a>School travel data for the route network</h4>
         <p>Download anonymised National School Census 2011 baseline and scenario cycling estimates for the route network in <!--region_name-->.  This was calculated using all fast routes. It is more complete than the version available via the web browser which excludes route segments with small numbers of cyclists (see the 'Region stats' tab).</p>
         <p>Baseline and scenario data are not presented for route segments containing 1 or 2 cyclists in the NSC 2011.  Instead these data are set as missing ('NA').</p>
         <ul>

regions_www/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="https://www.w3.org/1999/xhtml">
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -61,7 +61,7 @@
           <div class="main-container">
             <p> Welcome to the Propensity to Cycle Tool (PCT) for England and Wales, which provides an evidence base to inform cycling investment.</p>
             <p>To run the PCT, first hover over a region on the map on the left to see the regional potential, then click on the region.</p>
-            <p>For an introduction to the tool, its use, and the scenarios, please watch the video above.</p>
+            <p>For an introduction to the tool, its use, and the scenarios, please watch the video above and read the <a target="_blank" href="https://npct.github.io/pct-shiny/regions_www/www/static/03d_other_reports/2020-pct-essentials.pdf">Essentials</a>.</p>
             <p><strong>What's new :</strong> <a href="https://blog.pct.bike/2020/02/02/overlaying-commute-and-school-route-network-layers-to-estimate-whole-network-cycling-potential/" target = "_blank">Overlaying commute and school route network layers: report</a>.
             </p>
           </div>
@@ -106,5 +106,6 @@
           </div>
         </div>
     </div>
+    </div>
   </body>
 </html>

regions_www/tabs/about.html

@@ -33,14 +33,6 @@
     </script>
   </head>
   <body>
-
-    <style>
-      .carousel-inner > .item > img,
-      .carousel-inner > .item > a > img {
-        width: 60%;
-        margin: auto;
-      }
-    </style>
     <div id="includedNav"></div>
     <div id="includedContent"></div>
   </body>

regions_www/tabs/about_body.html

@@ -13,12 +13,12 @@
     <div class="col-md-9">
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h3><a name="about"></a>About the Propensity to Cycle Tool</h3>
+        <h3><a id="about"></a>About the Propensity to Cycle Tool</h3>
         <p> This is the online home of the open source transport planning system, the Propensity to Cycle Tool (PCT). The PCT is released under the <a href="/www/licence.html" target="_blank">Affero GPL</a>: it is free to use, copy and modify, e.g. to create versions for new cities and states. Please cite the journal article Lovelace et al. (<a href="https://www.jtlu.org/index.php/jtlu/article/view/862" target="_blank">2017</a>) and/or Goodman et al. (<a href="https://www.sciencedirect.com/science/article/pii/S2214140518301257" target="_blank">2019</a>) if you use the PCT in your work.</p>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="team"></a>The PCT Team</h4>
+        <h4><a id="team"></a>The PCT Team</h4>
 
 
         <div class="row">
@@ -173,7 +173,7 @@ <h5>With many thanks also to former PCT team members <b>Alvaro Ullrich</b> and <
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="aim"></a>Aim and scope of the PCT</h4>
+        <h4><a id="aim"></a>Aim and scope of the PCT</h4>
          <p>The PCT was designed to assist transport planners and policy makers to prioritise investments and interventions to promote cycling. The PCT answers the question: 'where is cycling currently common and where does cycling have the greatest potential to grow?'. The PCT can be used at different scales.</p>
          <p> First, the PCT is a strategic planning tool. Different visions of the future are represented through various scenarios of change, including the Department for Transport’s draft <a href="http://www.gov.uk/government/uploads/system/uploads/attachment_data/file/364791/141015_Cycling_Delivery_Plan.pdf" target="_blank">Cycling Delivery Plan</a> target to double cycling in a decade and the more ambitious ‘Go Dutch’ scenario, whereby cycling levels equivalent to the Netherlands are reached in England and Wales (allowing for English and Welsh hilliness and trip distances). By showing what the rate of cycling could feasibly look like in different parts of cities and regions, and illustrating the associated increase in cycle use on the road network, the PCT should inform policies that seek a wider shift towards sustainable transport.</p>
          <p>Second, the PCT can also be used at a smaller scale. The scenario level of commuter cycling along a particular road can be used to estimate future mode share for cycling on that corridor. This can be compared with current allocation of space to different modes, and used to consider re -allocation from less sustainable modes to cater for cycling growth. In other cases, low current or potential flows may indicate a barrier, such as a major road or rail line, causing severance and lengthening trips. This could be addressed through new infrastructure such as a pedestrian and cycle bridge.</p>
@@ -182,15 +182,15 @@ <h4><a name="aim"></a>Aim and scope of the PCT</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="funding"></a>Funding & Acknowledgements</h4>
+        <h4><a id="funding"></a>Funding & Acknowledgements</h4>
         <p>The work was initially funded by the English Department for Transport (DfT) to create the National Propensity to Cycle Tool for England (2015-2017, with further funding in 2018-19). The Welsh government funded the extension to Wales in 2018. We would also like to thank the EPSRC and ESRC for Impact Acceleration funding (2016-2017).</p>
         <p>We would like to thank Brook Lyndhurst for facilitating Phase 1 of the DfT contract and Atkins for facilitating Phase 2.</p>
         <p>We would like to acknowledge the support and encouragement we have had from Shane Snow, Philipp Thiessen, Richard Mace, Kaylisha Archer, John Sweetman, Rabina Nawaz and colleagues at the Department for Transport (DfT).</p>
         <p>Finally, we would like to thank <a target="_blank" href="http://www.cyclestreets.net">CycleStreets</a> for providing data on routes.</p>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="liability"></a>Scope, limitations and liability</h4>
+        <h4><a id="liability"></a>Scope, limitations and liability</h4>
          <p>The PCT uses transparent methods and reliable, tested data.
            However, the tool is limited in scope: the PCT is based on hypothetical national scenarios of cycling uptake.
            It is not a predictive tool and does not provide estimates of cycling uptake resulting from a given intervention.
@@ -200,12 +200,12 @@ <h4><a name="liability"></a>Scope, limitations and liability</h4>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="contact"></a>Contact Us</h4>
+        <h4><a id="contact"></a>Contact Us</h4>
           <p>For more information or questions, please contact us at: <a href="mailto:pct@pct.bike">pct@pct.bike</a>.</p>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
-        <h4><a name="references"></a>References</h4>
+        <h4><a id="references"></a>References</h4>
           <p>Aldred, R., Elliott, B., Woodcock, J., Goodman, A., 2017.
             Cycling Provision Separated From Motor Traffic: a systematic review exploring whether stated preferences vary by gender and age.Transport Reviews. 37:1, 29-55, <a href="http://www.tandfonline.com/doi/full/10.1080/01441647.2016.1200156" target="_blank">DOI: 10.1080/01441647.2016.1200156</a>.</p>
           <p>Lovelace, R., Goodman, A., Aldred, R., Berkoff, N., Abbas, A., Woodcock, J., 2017.The Propensity to Cycle Tool: An open source online system for sustainable transport planning. Journal of Transport and Land Use. 10:1, 505–528, <a target="_blank" href="https://www.jtlu.org/index.php/jtlu/article/view/862">DOI: 10.5198/jtlu.2016.862</a>.</p>

regions_www/tabs/manual.html

@@ -39,16 +39,6 @@
   </script>
 </head>
 <body>
-
-<style>
-
-.carousel-inner > .item > img,
-  .carousel-inner > .item > a > img {
-      width: 60%;
-      margin: auto;
-  }
-
-</style>
   <div id="includedNav"></div>
   <div id="includedContent"></div>
 </body>