Merge pull request #645 from npct/pct-wales-180115

Pct wales 180115

non_www/tabs/download_national.html

@@ -9,13 +9,13 @@
     <div class="col-md-9">
       <div class="col-md-12 text-left" style="padding-top:10px;">
         <h3>National Data</h3>
-        <p>This page contains data downloads for the whole of England. These are available as CSV files containing the zone and line baseline and scenario data, and in geographic files that can be read by R (.Rds) or GIS programs such as QGIS (.geojson).  Very large geographic files are available in R format only.</p>
+        <p>This page contains data downloads for the whole of England and Wales. These are available as CSV files containing the zone and line baseline and scenario data, and in geographic files that can be read by R (.Rds) or GIS programs such as QGIS (.geojson).  Very large geographic files are available in R format only.</p>
         <p>Please be aware that equivalent files for different geographies have <b>the same file name</b> when downloaded (e.g. ‘z_all.geojson’ for both the MSOA and LSOA national zones files).  To avoid confusion you may want to rename those files or save them in labelled folders. Note also that when <b>downloading 'csv' files using a Firefox browser</b>, the file will open onscreen in a new webpage.  If you then type "Ctrl + S" the onscreen data will download as a csv file.</p>
       </div>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
         <h4><a name="natcommutezones"></a>Commuting data for zones</h4>
-        <p>Download the Census 2011 and scenario attribute data for all zones in England.</p>
+        <p>Download the Census 2011 and scenario attribute data for all zones in England and Wales.</p>
         <ul>
           <li>Zones (local authorities)*:
             <a href="https://github.com/npct/pct-outputs-national/raw/master/commute//lad_attributes.csv" target="_blank" download="lad_attributes.csv" onclick="ga('send', 'event', 'download', 'lad_attributes.csv');">
@@ -49,7 +49,7 @@ <h4><a name="natcommutezones"></a>Commuting data for zones</h4>
 
       <div class="col-md-12 text-left" style="padding-top:10px;">
         <h4>Commuting data for flows</h4>
-        <p>Download the Census 2011 and scenario data for all flows starting or ending in England.</p>
+        <p>Download the Census 2011 and scenario data for all flows starting or ending in England or Wales.</p>
         <p>In the ‘All flows’ files, destinations are grouped as ‘Other’ for origin-destination pairs with a fastest-route distance &gt;30km, or with a destination outside England or Wales. In addition, for the LSOA ‘All flows’ file, destinations are grouped as ‘Under 3’ for origin-destination pairs where the bidirectional number of commuters (by any mode) would be 1 or 2. This is done for data protection reasons.</p>
         <p>The ‘Straight lines’, ‘Fast route’ and ‘Quieter routes’ files only include between-zone flows with fast route distance under 20km. In addition, the minimum number of commuters (by any mode, in either direction) must be 10 (MSOA) or 5 (LSOA).</p>
         <p>The LSOA route network includes all between-zone LSOA flows with fast route distance under 20km (with no minimum number of commuters).</p>

regions_www/pct_regions_lowres_scenario.geojson

@@ -1,6 +1,6 @@
 {
 "type": "FeatureCollection",
-                                                                                
+"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
 "features": [
 { "type": "Feature", "id": 0, "properties": { "rmapshaperid": 0, "region_name": "north-east", "bicycle_perc": 2, "govtarget_slc_perc": 5, "gendereq_slc_perc": 3, "dutch_slc_perc": 20, "ebike_slc_perc": 28 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -1.242233420383466, 54.722961875715256 ], [ -1.241935155339627, 54.722722805634241 ], [ -1.177633304549406, 54.699185504821706 ], [ -1.173849869575632, 54.691903462966977 ], [ -1.196329383917173, 54.698564953266704 ], [ -1.187509645505513, 54.693909487287243 ], [ -1.199251504962618, 54.680952652939332 ], [ -1.184401803210924, 54.660235069527815 ], [ -1.157723848885242, 54.648192861274786 ], [ -1.168731577447787, 54.64462558532211 ], [ -1.173207408421523, 54.633457176752728 ], [ -1.188611316460129, 54.632712753795523 ], [ -1.200701381464472, 54.623046107996927 ], [ -1.162076801949471, 54.622647574783102 ], [ -1.160612442953878, 54.610130166216067 ], [ -1.198605134832712, 54.582867568772869 ], [ -1.160254846206397, 54.604540132715478 ], [ -1.149130547960135, 54.61433175441654 ], [ -1.154624205104359, 54.627502607444214 ], [ -1.135446458808739, 54.629631025794957 ], [ -1.136550151842112, 54.639389176463602 ], [ -1.118812527922649, 54.628861447097336 ], [ -1.07234092368964, 54.620190747880535 ], [ -1.054119330577687, 54.616785089723351 ], [ -1.002414774955198, 54.593590196170389 ], [ -0.960287871279441, 54.585030651955634 ], [ -0.926218566127258, 54.586710600971529 ], [ -0.896030332208068, 54.571400747843334 ], [ -0.853223931063848, 54.571771170591049 ], [ -0.846350045165363, 54.569730248993523 ], [ -0.808810704597508, 54.558574002963404 ], [ -0.791176585345121, 54.560435095169687 ], [ -0.789652532410725, 54.560135484995868 ], [ -0.800419230602623, 54.55101089972657 ], [ -0.826984918443916, 54.548575109987766 ], [ -0.848647240648467, 54.53000385613371 ], [ -0.848530694828979, 54.487972976765455 ], [ -0.880825003890478, 54.497046894319794 ], [ -0.952951591966615, 54.488035514789971 ], [ -1.003401037698752, 54.503012096558422 ], [ -1.036851490043958, 54.494044018560331 ], [ -1.09452381807376, 54.506759801891178 ], [ -1.118380003905473, 54.498198551692511 ], [ -1.146196887650171, 54.502821601144461 ], [ -1.234865904336843, 54.510316032855151 ], [ -1.256674686161078, 54.501107922775468 ], [ -1.2574030703465, 54.487321845285585 ], [ -1.280978467689868, 54.490443087496999 ], [ -1.300337456600947, 54.475849868154022 ], [ -1.343628900309554, 54.464155394715853 ], [ -1.344914980416685, 54.472408014352588 ], [ -1.364417137349684, 54.465952424950544 ], [ -1.37256161454798, 54.472307487175861 ], [ -1.381010556698977, 54.494028960347514 ], [ -1.395050062323678, 54.485679928165425 ], [ -1.407088745995534, 54.493529666634224 ], [ -1.412786392814214, 54.477195417331977 ], [ -1.432117795095018, 54.47945457515884 ], [ -1.434905351300195, 54.487493141636506 ], [ -1.458507827606413, 54.503918857342882 ], [ -1.474557917647171, 54.500711102379633 ], [ -1.459192626320637, 54.49426801221869 ], [ -1.463798742157859, 54.473550839010933 ], [ -1.453413860985395, 54.466015433635398 ], [ -1.462791360719099, 54.461392274046815 ], [ -1.456150004971891, 54.452449231589249 ], [ -1.472052218450715, 54.455599560914742 ], [ -1.475372753426586, 54.473845143842183 ], [ -1.49905233325534, 54.475678243087287 ], [ -1.491775530200152, 54.486200469444398 ], [ -1.511340770711156, 54.47501224803505 ], [ -1.51413188533179, 54.483775067740858 ], [ -1.528836915679652, 54.484813724997238 ], [ -1.519832792326207, 54.471047026639539 ], [ -1.545672655701689, 54.471238512479324 ], [ -1.555195181230286, 54.484978196075296 ], [ -1.582980289333847, 54.49710076502874 ], [ -1.579214890730538, 54.505187698986333 ], [ -1.591880734827298, 54.504300878638645 ], [ -1.581068539401601, 54.512845616375508 ], [ -1.60263744187141, 54.510581659497895 ], [ -1.611484669914576, 54.520000786761756 ], [ -1.633329060160405, 54.514111404091025 ], [ -1.633773800143306, 54.525364366424114 ], [ -1.654675149647808, 54.524650131066771 ], [ -1.657937134700336, 54.534588923902888 ], [ -1.69692634951668, 54.536006446746811 ], [ -1.721310831045569, 54.542301730540871 ], [ -1.733091335884529, 54.527736375428539 ], [ -1.779696492848505, 54.531873036083738 ], [ -1.776132317756163, 54.506728540112654 ], [ -1.792976487016095, 54.484492471843694 ], [ -1.839433248071298, 54.508437193293332 ], [ -1.857800531573054, 54.503539780931995 ], [ -1.859129935061792, 54.481857883488395 ], [ -1.942543199266968, 54.45339534598903 ], [ -1.970059550178092, 54.451521532915621 ], [ -1.996764411065963, 54.466903439352457 ], [ -2.044729473685006, 54.475186300279184 ], [ -2.0431984866724, 54.483599456499356 ], [ -2.116596167647237, 54.462263504935464 ], [ -2.170212967703936, 54.458198744313407 ], [ -2.158997187351411, 54.472029595835096 ], [ -2.172397970663926, 54.532444119867492 ], [ -2.197530554188082, 54.532703965052207 ], [ -2.209488177013076, 54.551713337288675 ], [ -2.304514521803149, 54.596197840724649 ], [ -2.324937728838203, 54.63165023985902 ], [ -2.287978740484879, 54.650480077921806 ], [ -2.292874988661062, 54.663885332356735 ], [ -2.327287601420593, 54.670727676604301 ], [ -2.35176912049925, 54.685930866177841 ], [ -2.355743455204906, 54.697652138223184 ], [ -2.325746702836592, 54.726629192043887 ], [ -2.312089475978926, 54.791015005604024 ], [ -2.282677776847072, 54.798252109140599 ], [ -2.218906693018809, 54.782377417983099 ], [ -2.198600631882357, 54.806736265735417 ], [ -2.169470076917264, 54.803609952624377 ], [ -2.139788978483151, 54.841870676689275 ], [ -2.082475627052886, 54.838222062477129 ], [ -2.03975652817341, 54.848291545817702 ], [ -2.000966998550448, 54.869667693975316 ], [ -1.980236312627426, 54.868183463972606 ], [ -1.949057341564446, 54.852966979244023 ], [ -1.932681177760227, 54.854187382839108 ], [ -1.91376518516651, 54.833996763546324 ], [ -1.914043037944305, 54.839528916111647 ], [ -1.870103913087829, 54.850865696219863 ], [ -1.854436644267501, 54.89118451220412 ], [ -1.821013348694001, 54.905661883669389 ], [ -1.85272138657769, 54.917413555169418 ], [ -1.841149296053996, 54.929725523061016 ], [ -1.826951530061446, 54.930225567166239 ], [ -1.833690233854493, 54.953313463148255 ], [ -1.812812861267737, 54.976321791188056 ], [ -1.788349911423466, 54.984256024330357 ], [ -1.769756680082045, 54.980983743430393 ], [ -1.77384239636278, 55.00413945886082 ], [ -1.756563295670023, 55.003263299772499 ], [ -1.750245296693579, 55.024020806021433 ], [ -1.694883939253497, 55.042927318192632 ], [ -1.713759624556522, 55.065479364495253 ], [ -1.647681243582133, 55.079388743712435 ], [ -1.637893605385297, 55.064768597812005 ], [ -1.578539590883609, 55.063081305063783 ], [ -1.575080143903281, 55.055619936266432 ], [ -1.557040794119764, 55.054178204174235 ], [ -1.539868383211581, 55.061590686768682 ], [ -1.532339685302761, 55.054149510342356 ], [ -1.51028422716442, 55.055008941093071 ], [ -1.508632110195518, 55.048020186570561 ], [ -1.487813656399596, 55.053592005808092 ], [ -1.492328580453206, 55.066058363734157 ], [ -1.461817305164856, 55.074372673919115 ], [ -1.461773601539244, 55.074321110342765 ], [ -1.449915937399108, 55.058035567212166 ], [ -1.445824750742653, 55.052413313769797 ], [ -1.429890794226608, 55.030500016680911 ], [ -1.420723368734304, 55.025087747629968 ], [ -1.402954150773943, 55.014591035484798 ], [ -1.421856333129753, 55.013623339188754 ], [ -1.429841603977484, 55.013228472117618 ], [ -1.453303578821546, 54.989815343048939 ], [ -1.530845842381931, 54.984015283094649 ], [ -1.449527652772154, 54.984335587157297 ], [ -1.42566118478931, 55.006541054406888 ], [ -1.423906160983701, 55.00817276842249 ], [ -1.418659449411185, 55.003262990539483 ], [ -1.401289336646782, 55.011102863603412 ], [ -1.409390080142061, 55.003233765260958 ], [ -1.412272277329852, 55.000433105967588 ], [ -1.40425043560938, 54.995907040626967 ], [ -1.360740554385907, 54.971331066950199 ], [ -1.353213373597629, 54.957568339783826 ], [ -1.35979687975146, 54.951518487251576 ], [ -1.369683807707712, 54.942428798520076 ], [ -1.375684868053493, 54.936909082730367 ], [ -1.364668482949837, 54.943689567931663 ], [ -1.364002322086811, 54.943857118944919 ], [ -1.365290521659401, 54.933027368308494 ], [ -1.366113807262835, 54.926102895297788 ], [ -1.358895780744298, 54.923579386583377 ], [ -1.352289929177787, 54.921269251522844 ], [ -1.363412747163235, 54.922742211794947 ], [ -1.370881228864611, 54.911767892828571 ], [ -1.352755933792825, 54.91916434844844 ], [ -1.350393743821296, 54.905902891043077 ], [ -1.361640171638669, 54.898297513359871 ], [ -1.35556632292972, 54.877412165497581 ], [ -1.347449568949942, 54.860629603461426 ], [ -1.347240327303831, 54.860448699201086 ], [ -1.320991310900458, 54.837738870939397 ], [ -1.300755747968796, 54.769802138288561 ], [ -1.298391797425102, 54.767912704523262 ], [ -1.298323761811782, 54.767699634878191 ], [ -1.295277335883523, 54.76542299425472 ], [ -1.279515928181597, 54.752817838479473 ], [ -1.242233420383466, 54.722961875715256 ] ] ] ] } },
 { "type": "Feature", "id": 1, "properties": { "rmapshaperid": 1, "region_name": "liverpool-city-region", "bicycle_perc": 2, "govtarget_slc_perc": 6, "gendereq_slc_perc": 3, "dutch_slc_perc": 23, "ebike_slc_perc": 30 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -2.690632803364347, 53.385388198875312 ], [ -2.690907697062183, 53.358154019239336 ], [ -2.674640827034463, 53.353664398784737 ], [ -2.630621949015103, 53.364049798499984 ], [ -2.631467773987134, 53.346033556904288 ], [ -2.606606462436512, 53.342995919998401 ], [ -2.619125420188679, 53.331070600443944 ], [ -2.595223105393976, 53.32245434572998 ], [ -2.609086573898332, 53.312071202293055 ], [ -2.619934770655549, 53.320320941425777 ], [ -2.624122729072159, 53.309398159042225 ], [ -2.645061462981967, 53.31013510072038 ], [ -2.641556920234711, 53.305034798954338 ], [ -2.685151721447283, 53.315451458784942 ], [ -2.700801145463609, 53.305807188685421 ], [ -2.723525372866883, 53.313139644586883 ], [ -2.738205579454343, 53.306696377405849 ], [ -2.752489243055059, 53.31473267321978 ], [ -2.763058054085392, 53.330921741209373 ], [ -2.753249998793975, 53.343599557050482 ], [ -2.740202777458212, 53.345064898811152 ], [ -2.73819144573771, 53.347936462847912 ], [ -2.759133573123073, 53.349606490722962 ], [ -2.775525784367588, 53.338953755144878 ], [ -2.785584172527674, 53.323459427911672 ], [ -2.82214951205345, 53.333409367137406 ], [ -2.8275834556324, 53.33098145503876 ], [ -2.836474654189664, 53.327007697581699 ], [ -2.878158399223132, 53.334198839003406 ], [ -2.902709394242748, 53.345606530987155 ], [ -2.981723299418059, 53.382244522879603 ], [ -3.003355676912073, 53.414106621214493 ], [ -3.00864346820523, 53.437879125163541 ], [ -3.008755289200723, 53.438381544987308 ], [ -3.027246549667705, 53.45377380244976 ], [ -3.041479373161315, 53.465611804007374 ], [ -3.057378294139388, 53.492038968900104 ], [ -3.065061851345444, 53.504797194326713 ], [ -3.063237729071805, 53.523895619942778 ], [ -3.076120415483375, 53.523381114073068 ], [ -3.104768696492224, 53.547204300792018 ], [ -3.097501141360911, 53.574424377942947 ], [ -3.042724837134287, 53.63632936066675 ], [ -3.000183544275991, 53.672304408755409 ], [ -2.969347528565553, 53.698333035433961 ], [ -2.971489600617805, 53.692162262116291 ], [ -2.956219091956773, 53.697487853963885 ], [ -2.946785692389518, 53.688017573311789 ], [ -2.940143468857331, 53.658610543802943 ], [ -2.967259152524872, 53.631328625606905 ], [ -2.981823090915331, 53.622205172230693 ], [ -2.997889360828836, 53.626667091732358 ], [ -3.028822210874487, 53.602320005390844 ], [ -3.035986086402925, 53.587218380487457 ], [ -3.020709182019183, 53.583675188411533 ], [ -3.022620050410756, 53.569597902822736 ], [ -3.040388494448187, 53.565272091455668 ], [ -3.046698573891413, 53.542958310005211 ], [ -2.975826163981934, 53.515287917683786 ], [ -2.962964308127532, 53.523705881547571 ], [ -2.977613993608117, 53.545923111393421 ], [ -2.947893121131085, 53.544353813055714 ], [ -2.923009383496503, 53.52522004809434 ], [ -2.881716296010707, 53.520543909198139 ], [ -2.88799420872738, 53.5038287512821 ], [ -2.865154890142569, 53.492087164614858 ], [ -2.849836480861115, 53.493139187692599 ], [ -2.844421165855544, 53.484130421650974 ], [ -2.824964418643882, 53.485209251943168 ], [ -2.816740225622259, 53.512174502751883 ], [ -2.782476487787793, 53.531430164627025 ], [ -2.76887249060704, 53.513571508194119 ], [ -2.730520979649466, 53.520600155435311 ], [ -2.698893068771931, 53.502031594015534 ], [ -2.666295793657666, 53.499757438746109 ], [ -2.645540037976687, 53.480252326934803 ], [ -2.612138304957025, 53.481138119107598 ], [ -2.615359095464244, 53.463601378398231 ], [ -2.576742842252519, 53.44605721193944 ], [ -2.585296076240573, 53.439807240173145 ], [ -2.598684944332368, 53.450413791025824 ], [ -2.59623052801199, 53.442666252543752 ], [ -2.627462363829727, 53.4344125828963 ], [ -2.639135954936644, 53.444390997649002 ], [ -2.677170457694838, 53.452786259673452 ], [ -2.68207561344575, 53.438901411512852 ], [ -2.66851358449548, 53.440907067283312 ], [ -2.675267702455686, 53.432965304698513 ], [ -2.663554659619895, 53.428713682988111 ], [ -2.676317183614427, 53.387619330309228 ], [ -2.690632803364347, 53.385388198875312 ] ] ], [ [ [ -2.928756466815117, 53.308412993049409 ], [ -2.931602543078512, 53.306068832815846 ], [ -2.939551319692313, 53.310415634887732 ], [ -2.968033296688178, 53.3012551093274 ], [ -2.992737815610769, 53.307108783315464 ], [ -3.026139522596778, 53.297748692094054 ], [ -3.07416549049198, 53.316380908019056 ], [ -3.103733121138837, 53.299994354276727 ], [ -3.109014716657826, 53.297257507456393 ], [ -3.116634355843911, 53.311718655709861 ], [ -3.122336556752299, 53.32253388267948 ], [ -3.186277019464458, 53.364446031007347 ], [ -3.200369334312616, 53.387514329959508 ], [ -3.173632630587143, 53.401435830864266 ], [ -3.040320321436734, 53.442896549533948 ], [ -3.01645759994499, 53.410577110896554 ], [ -3.002522132920189, 53.374732452146638 ], [ -2.934169251041866, 53.313288041250125 ], [ -2.928756466815117, 53.308412993049409 ] ] ] ] } },