From 2f0029daef6135bcfe19349edb5a6aa0e1c71189 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Fri, 12 Feb 2021 13:30:59 -0800 Subject: [PATCH] Import 7 more actdev sites, since cyipt/actdev#77 is fixed poundbury is missing files, and halsnead had some issue with the boundary, will look into it later. --- .gitignore | 7 + data/MANIFEST.json | 140 ++++++++++++++++++ data/system/study_areas/aylesham.geojson | 8 + data/system/study_areas/culm.geojson | 8 + data/system/study_areas/dickens-heath.geojson | 8 + data/system/study_areas/dunton-hills.geojson | 8 + data/system/study_areas/hampton.geojson | 8 + data/system/study_areas/micklefield.geojson | 8 + .../study_areas/newcastle-great-park.geojson | 8 + importer/actdev_site.sh | 2 +- importer/config/aylesham/center.poly | 129 ++++++++++++++++ importer/config/aylesham/cfg.json | 18 +++ importer/config/culm/center.poly | 130 ++++++++++++++++ importer/config/culm/cfg.json | 18 +++ importer/config/dickens_heath/center.poly | 129 ++++++++++++++++ importer/config/dickens_heath/cfg.json | 18 +++ importer/config/dunton_hills/center.poly | 127 ++++++++++++++++ importer/config/dunton_hills/cfg.json | 18 +++ importer/config/hampton/center.poly | 129 ++++++++++++++++ importer/config/hampton/cfg.json | 18 +++ importer/config/micklefield/center.poly | 129 ++++++++++++++++ importer/config/micklefield/cfg.json | 18 +++ .../config/newcastle_great_park/center.poly | 131 ++++++++++++++++ importer/config/newcastle_great_park/cfg.json | 18 +++ map_gui/src/tools/mod.rs | 7 + release/deploy_actdev.sh | 2 +- 26 files changed, 1242 insertions(+), 2 deletions(-) create mode 100644 data/system/study_areas/aylesham.geojson create mode 100644 data/system/study_areas/culm.geojson create mode 100644 data/system/study_areas/dickens-heath.geojson create mode 100644 data/system/study_areas/dunton-hills.geojson create mode 100644 data/system/study_areas/hampton.geojson create mode 100644 data/system/study_areas/micklefield.geojson create mode 100644 data/system/study_areas/newcastle-great-park.geojson create mode 100644 importer/config/aylesham/center.poly create mode 100644 importer/config/aylesham/cfg.json create mode 100644 importer/config/culm/center.poly create mode 100644 importer/config/culm/cfg.json create mode 100644 importer/config/dickens_heath/center.poly create mode 100644 importer/config/dickens_heath/cfg.json create mode 100644 importer/config/dunton_hills/center.poly create mode 100644 importer/config/dunton_hills/cfg.json create mode 100644 importer/config/hampton/center.poly create mode 100644 importer/config/hampton/cfg.json create mode 100644 importer/config/micklefield/center.poly create mode 100644 importer/config/micklefield/cfg.json create mode 100644 importer/config/newcastle_great_park/center.poly create mode 100644 importer/config/newcastle_great_park/cfg.json diff --git a/.gitignore b/.gitignore index be683daf7f..bc00aeb767 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ data/input data/system/allerton_bywater data/system/ashton_park data/system/aylesbury +data/system/aylesham data/system/bailrigg data/system/bath_riverside data/system/bellevue @@ -19,10 +20,14 @@ data/system/bicester data/system/castlemead data/system/chapelford data/system/clackers_brook +data/system/culm +data/system/dickens_heath data/system/didcot data/system/detroit +data/system/dunton_hills data/system/ebbsfleet data/system/great_kneighton +data/system/hampton data/system/handforth data/system/kidbrooke_village data/system/krakow @@ -30,7 +35,9 @@ data/system/lcid data/system/leeds data/system/london data/system/long_marston +data/system/micklefield data/system/montreal +data/system/newcastle_great_park data/system/nyc data/system/paris data/system/providence diff --git a/data/MANIFEST.json b/data/MANIFEST.json index 122cddd9dd..f965a17009 100644 --- a/data/MANIFEST.json +++ b/data/MANIFEST.json @@ -45,6 +45,21 @@ "uncompressed_size_bytes": 3264642, "compressed_size_bytes": 717931 }, + "data/input/aylesham/osm/center.osm": { + "checksum": "39f60a4a35991d3fd8b92681c935f3c6", + "uncompressed_size_bytes": 21809141, + "compressed_size_bytes": 2224125 + }, + "data/input/aylesham/osm/kent-latest.osm.pbf": { + "checksum": "9de7820c89c5715bd66bc4b5f253f324", + "uncompressed_size_bytes": 34299729, + "compressed_size_bytes": 34272498 + }, + "data/input/aylesham/raw_maps/center.bin": { + "checksum": "48d297817f03f646ab684d28106703f3", + "uncompressed_size_bytes": 7096522, + "compressed_size_bytes": 1526929 + }, "data/input/bailrigg/osm/center.osm": { "checksum": "76eeaae1600b70f6d833ffa9242a4d10", "uncompressed_size_bytes": 31499428, @@ -175,6 +190,21 @@ "uncompressed_size_bytes": 4139287, "compressed_size_bytes": 1039246 }, + "data/input/culm/osm/center.osm": { + "checksum": "744d5f43fb357316a039bd49adc93f96", + "uncompressed_size_bytes": 98756676, + "compressed_size_bytes": 9917079 + }, + "data/input/culm/osm/devon-latest.osm.pbf": { + "checksum": "f45268d81d91d79ae785bceb39e55403", + "uncompressed_size_bytes": 40465778, + "compressed_size_bytes": 40427498 + }, + "data/input/culm/raw_maps/center.bin": { + "checksum": "9280f42032d999fb7552a6dabb2b9196", + "uncompressed_size_bytes": 23752166, + "compressed_size_bytes": 6190654 + }, "data/input/detroit/osm/downtown.osm": { "checksum": "5c8dd6ecc94a80879bac965ef624e2e7", "uncompressed_size_bytes": 40741899, @@ -190,6 +220,21 @@ "uncompressed_size_bytes": 10865116, "compressed_size_bytes": 2621266 }, + "data/input/dickens_heath/osm/center.osm": { + "checksum": "ee0f02fd05bae34e7fe8c56494cc002e", + "uncompressed_size_bytes": 67026672, + "compressed_size_bytes": 6240097 + }, + "data/input/dickens_heath/osm/west-midlands-latest.osm.pbf": { + "checksum": "f05d18cb8e402fbe32f2b5a6aa8d96a3", + "uncompressed_size_bytes": 45550928, + "compressed_size_bytes": 45514449 + }, + "data/input/dickens_heath/raw_maps/center.bin": { + "checksum": "e8c3e31e8b87f5d441c15f5b0f941b5b", + "uncompressed_size_bytes": 21327827, + "compressed_size_bytes": 4569790 + }, "data/input/didcot/osm/center.osm": { "checksum": "bcc8a2a2e4af2b24c300463ac5ffaf9b", "uncompressed_size_bytes": 8753735, @@ -205,6 +250,21 @@ "uncompressed_size_bytes": 2662068, "compressed_size_bytes": 600110 }, + "data/input/dunton_hills/osm/center.osm": { + "checksum": "dc4a1861d7e8fd7a2128d10e653129b0", + "uncompressed_size_bytes": 38733501, + "compressed_size_bytes": 3842246 + }, + "data/input/dunton_hills/osm/essex-latest.osm.pbf": { + "checksum": "496d2220c8456122f0205771f8277c20", + "uncompressed_size_bytes": 39345299, + "compressed_size_bytes": 39309725 + }, + "data/input/dunton_hills/raw_maps/center.bin": { + "checksum": "79c6bd4c363178ddc3c913751e8d34eb", + "uncompressed_size_bytes": 8874194, + "compressed_size_bytes": 2416262 + }, "data/input/ebbsfleet/osm/center.osm": { "checksum": "e30b891681f4725c272b8ae761767cc2", "uncompressed_size_bytes": 9566332, @@ -245,6 +305,21 @@ "uncompressed_size_bytes": 36534403, "compressed_size_bytes": 36518044 }, + "data/input/hampton/osm/cambridgeshire-latest.osm.pbf": { + "checksum": "c4ec8f81dc604526443750f695886ebf", + "uncompressed_size_bytes": 22722189, + "compressed_size_bytes": 22703825 + }, + "data/input/hampton/osm/center.osm": { + "checksum": "90f4b14f638765fbddad3126aab2bac9", + "uncompressed_size_bytes": 32295731, + "compressed_size_bytes": 3231860 + }, + "data/input/hampton/raw_maps/center.bin": { + "checksum": "2f483bb31985f6ed8aa2b69c7cb76a6e", + "uncompressed_size_bytes": 9557862, + "compressed_size_bytes": 2278718 + }, "data/input/handforth/osm/center.osm": { "checksum": "749c231697ed985991d0addaeee3d269", "uncompressed_size_bytes": 17851841, @@ -415,6 +490,21 @@ "uncompressed_size_bytes": 6952197, "compressed_size_bytes": 1873328 }, + "data/input/micklefield/osm/center.osm": { + "checksum": "5842bd67b1e222e96bee0818a893d11d", + "uncompressed_size_bytes": 67560344, + "compressed_size_bytes": 6592474 + }, + "data/input/micklefield/osm/west-yorkshire-latest.osm.pbf": { + "checksum": "aa31a8613231e08a01128c7ae9f81bea", + "uncompressed_size_bytes": 35218633, + "compressed_size_bytes": 35176889 + }, + "data/input/micklefield/raw_maps/center.bin": { + "checksum": "3a041a67fdfb7d347732813e4030dd2a", + "uncompressed_size_bytes": 20843129, + "compressed_size_bytes": 4892091 + }, "data/input/montreal/osm/plateau.osm": { "checksum": "3e9fcd785e89531e4c5e207c44030e85", "uncompressed_size_bytes": 16904962, @@ -430,6 +520,21 @@ "uncompressed_size_bytes": 4840740, "compressed_size_bytes": 1214448 }, + "data/input/newcastle_great_park/osm/center.osm": { + "checksum": "c7763a1360b2bccf210ae3464eafcf61", + "uncompressed_size_bytes": 44162743, + "compressed_size_bytes": 4293768 + }, + "data/input/newcastle_great_park/osm/tyne-and-wear-latest.osm.pbf": { + "checksum": "d7b0a59cc6f14d0ddd6e6c613f6a7435", + "uncompressed_size_bytes": 17075842, + "compressed_size_bytes": 17044376 + }, + "data/input/newcastle_great_park/raw_maps/center.bin": { + "checksum": "d4db2c0766bbf9efbbe24114d9a253e6", + "uncompressed_size_bytes": 13843700, + "compressed_size_bytes": 3216897 + }, "data/input/nyc/osm/lower_manhattan.osm": { "checksum": "09bf8cdb40474741b58e74f4c486a69e", "uncompressed_size_bytes": 34156510, @@ -935,6 +1040,11 @@ "uncompressed_size_bytes": 19520151, "compressed_size_bytes": 6605100 }, + "data/system/aylesham/maps/center.bin": { + "checksum": "2a0f076e2ce179e9c746ab3f87ea8560", + "uncompressed_size_bytes": 18519925, + "compressed_size_bytes": 6371669 + }, "data/system/bailrigg/maps/center.bin": { "checksum": "336a9a56c79db635cb7dbe4115eb21ef", "uncompressed_size_bytes": 21735005, @@ -975,16 +1085,31 @@ "uncompressed_size_bytes": 23521293, "compressed_size_bytes": 8212656 }, + "data/system/culm/maps/center.bin": { + "checksum": "41582ffee7e7cdb7ce58816d65edf463", + "uncompressed_size_bytes": 69529480, + "compressed_size_bytes": 24660179 + }, "data/system/detroit/maps/downtown.bin": { "checksum": "254736ae813951a49d987b60ec2b643e", "uncompressed_size_bytes": 65552554, "compressed_size_bytes": 21974224 }, + "data/system/dickens_heath/maps/center.bin": { + "checksum": "c15d146bb8993ca30032d69d7b5e63ae", + "uncompressed_size_bytes": 47132204, + "compressed_size_bytes": 16458121 + }, "data/system/didcot/maps/center.bin": { "checksum": "b90ccb80317166baff0327da36a8a762", "uncompressed_size_bytes": 12688711, "compressed_size_bytes": 4331434 }, + "data/system/dunton_hills/maps/center.bin": { + "checksum": "f57ea3a3fb9348b5b17adff902f27eaf", + "uncompressed_size_bytes": 43850382, + "compressed_size_bytes": 15320386 + }, "data/system/ebbsfleet/maps/center.bin": { "checksum": "178e30b28894fcb7b468b81e874bc758", "uncompressed_size_bytes": 12092110, @@ -1005,6 +1130,11 @@ "uncompressed_size_bytes": 71753, "compressed_size_bytes": 19227 }, + "data/system/hampton/maps/center.bin": { + "checksum": "d4a7224d0bc002d26e43ec2a8d9582c3", + "uncompressed_size_bytes": 42625956, + "compressed_size_bytes": 14642940 + }, "data/system/handforth/maps/center.bin": { "checksum": "a21f096aa4b75c9b5c46994c18a849d8", "uncompressed_size_bytes": 14038727, @@ -1060,11 +1190,21 @@ "uncompressed_size_bytes": 17319113, "compressed_size_bytes": 6217379 }, + "data/system/micklefield/maps/center.bin": { + "checksum": "8ff151e9553073a19f9dbb46177c02e4", + "uncompressed_size_bytes": 64826345, + "compressed_size_bytes": 21933062 + }, "data/system/montreal/maps/plateau.bin": { "checksum": "c4421dd74cf45f4277e108720b460895", "uncompressed_size_bytes": 14781151, "compressed_size_bytes": 4957355 }, + "data/system/newcastle_great_park/maps/center.bin": { + "checksum": "52746ce8aff7e542e7fd6f5c6165c1b6", + "uncompressed_size_bytes": 49961043, + "compressed_size_bytes": 17287425 + }, "data/system/nyc/city.bin": { "checksum": "8a458410f6484bfb5ca4b0bdcdbfd92c", "uncompressed_size_bytes": 948407, diff --git a/data/system/study_areas/aylesham.geojson b/data/system/study_areas/aylesham.geojson new file mode 100644 index 0000000000..20eec9d57e --- /dev/null +++ b/data/system/study_areas/aylesham.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "aylesham", "dwellings_when_complete": 1200.0, "pwalk": 0.1, "pcycle": 0.02, "pdrive": 0.7, "pbus": 0.03, "prail": 0.05, "pother": 0.1, "weightedJobsPTt": 32.744475383928574, "weightedJobsCyct": 49.122372964285717, "weightedJobsCart": 21.119364776785712, "PSPTt": 7.0, "PSCyct": 7.5, "PSCart": 7.5, "SSPTt": 33.0550415, "SSCyct": 46.4644995, "SSCart": 18.158513, "FEPTt": 33.0550415, "FECyct": 46.4644995, "FECart": 18.158513, "GPPTt": 7.692563, "GPCyct": 7.460785, "GPCart": 7.215455, "HospPTt": 45.640521, "HospCyct": 51.1745, "HospCart": 21.7648075, "FoodPTt": 6.2110845, "FoodCyct": 7.2782515, "FoodCart": 7.042434, "TownPTt": 38.126728, "TownCyct": 52.7134325, "TownCart": 22.575841 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 1.204376, 51.231008 ], [ 1.201651, 51.23254 ], [ 1.199698, 51.233104 ], [ 1.194763, 51.231129 ], [ 1.194077, 51.230511 ], [ 1.193368, 51.22914 ], [ 1.192939, 51.226762 ], [ 1.197789, 51.228509 ], [ 1.19972, 51.229046 ], [ 1.202316, 51.23039 ], [ 1.204376, 51.231008 ] ] ] } } +] +} diff --git a/data/system/study_areas/culm.geojson b/data/system/study_areas/culm.geojson new file mode 100644 index 0000000000..3c291f277f --- /dev/null +++ b/data/system/study_areas/culm.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "culm", "dwellings_when_complete": 1750.0, "pwalk": 0.1, "pcycle": 0.02, "pdrive": 0.73, "pbus": 0.05, "prail": 0.01, "pother": 0.08, "weightedJobsPTt": 66.728266160714284, "weightedJobsCyct": 72.961735294642864, "weightedJobsCart": 23.414440669642858, "PSPTt": 15.5, "PSCyct": 11.0, "PSCart": 8.5, "SSPTt": 20.7509285, "SSCyct": 16.9662135, "SSCart": 11.606181, "FEPTt": 45.7471815, "FECyct": 56.7694955, "FECart": 21.6745125, "GPPTt": 15.7575105, "GPCyct": 13.9197225, "GPCart": 9.4787015, "HospPTt": 60.626019, "HospCyct": 51.2944765, "HospCart": 23.2242, "FoodPTt": 17.032958, "FoodCyct": 13.1407975, "FoodCart": 9.12445, "TownPTt": 18.895037, "TownCyct": 14.7602965, "TownCart": 9.9968645 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -3.381343, 50.855647 ], [ -3.381214, 50.854103 ], [ -3.375678, 50.85478 ], [ -3.365808, 50.853994 ], [ -3.363147, 50.856053 ], [ -3.36216, 50.864261 ], [ -3.366365, 50.86483 ], [ -3.369455, 50.865778 ], [ -3.371773, 50.866266 ], [ -3.373017, 50.864261 ], [ -3.37379, 50.863855 ], [ -3.373318, 50.861552 ], [ -3.376322, 50.85841 ], [ -3.374391, 50.857516 ], [ -3.375249, 50.856433 ], [ -3.381343, 50.855647 ] ] ] } } +] +} diff --git a/data/system/study_areas/dickens-heath.geojson b/data/system/study_areas/dickens-heath.geojson new file mode 100644 index 0000000000..8d7a89057b --- /dev/null +++ b/data/system/study_areas/dickens-heath.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "dickens-heath", "dwellings_when_complete": 1672.0, "pwalk": 0.03, "pcycle": 0.01, "pdrive": 0.82, "pbus": 0.02, "prail": 0.07, "pother": 0.05, "weightedJobsPTt": 31.103569422619049, "weightedJobsCyct": 26.853257523809525, "weightedJobsCart": 18.538073738095235, "PSPTt": 10.333333333333334, "PSCyct": 8.6666666666666661, "PSCart": 8.0, "SSPTt": 17.670044666666666, "SSCyct": 15.773633666666667, "SSCart": 11.687306333333334, "FEPTt": 26.527033333333332, "FECyct": 19.992438, "FECart": 12.793484333333334, "GPPTt": 15.146629, "GPCyct": 11.873359666666667, "GPCart": 9.16438, "HospPTt": 36.03238, "HospCyct": 31.257880666666665, "HospCart": 20.880448333333334, "FoodPTt": 6.5408106666666663, "FoodCyct": 7.351037, "FoodCart": 6.8498846666666671, "TownPTt": 25.266921666666669, "TownCyct": 17.047799333333334, "TownCart": 11.983452 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -1.841798, 52.39184 ], [ -1.842828, 52.390504 ], [ -1.842871, 52.388252 ], [ -1.84094, 52.38799 ], [ -1.840725, 52.387518 ], [ -1.840167, 52.384768 ], [ -1.840639, 52.384558 ], [ -1.843729, 52.383353 ], [ -1.844845, 52.382882 ], [ -1.842699, 52.380446 ], [ -1.840553, 52.380393 ], [ -1.83639, 52.380524 ], [ -1.833901, 52.380315 ], [ -1.834116, 52.382175 ], [ -1.833944, 52.38283 ], [ -1.83197, 52.383825 ], [ -1.829309, 52.385894 ], [ -1.829567, 52.386523 ], [ -1.833258, 52.388199 ], [ -1.835575, 52.390033 ], [ -1.838279, 52.391316 ], [ -1.841798, 52.39184 ] ] ] } } +] +} diff --git a/data/system/study_areas/dunton-hills.geojson b/data/system/study_areas/dunton-hills.geojson new file mode 100644 index 0000000000..e246028998 --- /dev/null +++ b/data/system/study_areas/dunton-hills.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "dunton-hills", "dwellings_when_complete": 4000.0, "pwalk": 0.05, "pcycle": 0.01, "pdrive": 0.64, "pbus": 0.02, "prail": 0.2, "pother": 0.07, "weightedJobsPTt": 22.323352392857142, "weightedJobsCyct": 20.681474178571428, "weightedJobsCart": 11.610511875, "PSPTt": 11.5, "PSCyct": 10.5, "PSCart": 8.0, "SSPTt": 21.471472, "SSCyct": 23.3288255, "SSCart": 12.487188, "FEPTt": 25.259268, "FECyct": 25.7107145, "FECart": 13.669603, "GPPTt": 18.786563, "GPCyct": 20.3365615, "GPCart": 11.0767095, "HospPTt": 38.817178, "HospCyct": 31.846015, "HospCart": 15.0456035, "FoodPTt": 8.062551, "FoodCyct": 8.873727, "FoodCart": 7.1673945, "TownPTt": 23.9973595, "TownCyct": 29.1730895, "TownCart": 15.1163635 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 0.363235, 51.579523 ], [ 0.357914, 51.574616 ], [ 0.358601, 51.566934 ], [ 0.38332, 51.566187 ], [ 0.382977, 51.581763 ], [ 0.363235, 51.579523 ] ] ] } } +] +} diff --git a/data/system/study_areas/hampton.geojson b/data/system/study_areas/hampton.geojson new file mode 100644 index 0000000000..cba0662ca6 --- /dev/null +++ b/data/system/study_areas/hampton.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "hampton", "dwellings_when_complete": 6900.0, "pwalk": 0.07, "pcycle": 0.06, "pdrive": 0.68, "pbus": 0.07, "prail": 0.03, "pother": 0.08, "weightedJobsPTt": 31.201847966517857, "weightedJobsCyct": 20.364751104910713, "weightedJobsCart": 11.791279178571427, "PSPTt": 6.75, "PSCyct": 7.875, "PSCart": 7.75, "SSPTt": 13.937324625, "SSCyct": 10.636286125, "SSCart": 9.78807925, "FEPTt": 13.937324625, "FECyct": 10.636286125, "FECart": 9.78807925, "GPPTt": 12.558325, "GPCyct": 10.482151, "GPCart": 9.930324375, "HospPTt": 57.309889624999997, "HospCyct": 32.30165125, "HospCart": 16.428406875, "FoodPTt": 6.93724725, "FoodCyct": 7.397339, "FoodCart": 6.91281825, "TownPTt": 16.77866675, "TownCyct": 11.39722725, "TownCart": 9.73138425 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -0.281696, 52.540084 ], [ -0.282984, 52.536638 ], [ -0.289507, 52.527345 ], [ -0.28779, 52.525517 ], [ -0.278177, 52.528232 ], [ -0.271397, 52.529799 ], [ -0.267792, 52.52771 ], [ -0.264616, 52.530634 ], [ -0.265131, 52.533088 ], [ -0.266933, 52.535124 ], [ -0.259724, 52.535177 ], [ -0.257063, 52.538205 ], [ -0.263243, 52.538205 ], [ -0.26556, 52.538727 ], [ -0.265045, 52.54165 ], [ -0.262985, 52.542903 ], [ -0.265045, 52.54473 ], [ -0.273628, 52.543581 ], [ -0.281696, 52.540084 ] ] ] } } +] +} diff --git a/data/system/study_areas/micklefield.geojson b/data/system/study_areas/micklefield.geojson new file mode 100644 index 0000000000..ef1e8d9673 --- /dev/null +++ b/data/system/study_areas/micklefield.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "micklefield", "dwellings_when_complete": 292.0, "pwalk": 0.04, "pcycle": 0.01, "pdrive": 0.75, "pbus": 0.08, "prail": 0.06, "pother": 0.07, "weightedJobsPTt": 23.125754285714287, "weightedJobsCyct": 28.353584991071429, "weightedJobsCart": 15.309857017857144, "PSPTt": 9.0, "PSCyct": 8.5, "PSCart": 7.0, "SSPTt": 22.6165, "SSCyct": 28.5571035, "SSCart": 14.491471, "FEPTt": 22.6165, "FECyct": 28.5571035, "FECart": 14.491471, "GPPTt": 17.4931935, "GPCyct": 24.5063345, "GPCart": 12.714906, "HospPTt": 45.3076645, "HospCyct": 56.7411665, "HospCart": 24.0941515, "FoodPTt": 17.6464735, "FoodCyct": 22.9554465, "FoodCart": 12.0302465, "TownPTt": 18.115611, "TownCyct": 24.5079725, "TownCart": 13.5276945 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -1.328294, 53.796316 ], [ -1.326728, 53.794808 ], [ -1.326213, 53.794922 ], [ -1.32587, 53.794593 ], [ -1.325934, 53.794225 ], [ -1.326449, 53.793769 ], [ -1.32617, 53.793579 ], [ -1.326277, 53.793122 ], [ -1.327565, 53.792007 ], [ -1.327543, 53.791538 ], [ -1.325526, 53.79221 ], [ -1.324528, 53.790784 ], [ -1.324153, 53.790847 ], [ -1.323187, 53.789611 ], [ -1.322715, 53.789637 ], [ -1.322737, 53.790663 ], [ -1.322715, 53.793313 ], [ -1.323595, 53.795125 ], [ -1.324818, 53.795594 ], [ -1.326663, 53.796963 ], [ -1.328294, 53.796316 ] ] ] } } +] +} diff --git a/data/system/study_areas/newcastle-great-park.geojson b/data/system/study_areas/newcastle-great-park.geojson new file mode 100644 index 0000000000..817b5ede76 --- /dev/null +++ b/data/system/study_areas/newcastle-great-park.geojson @@ -0,0 +1,8 @@ +{ +"type": "FeatureCollection", +"name": "site", +"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, +"features": [ +{ "type": "Feature", "properties": { "site_name": "newcastle-great-park", "dwellings_when_complete": 4400.0, "pwalk": 0.07, "pcycle": 0.02, "pdrive": 0.62, "pbus": 0.14, "prail": 0.08, "pother": 0.07, "weightedJobsPTt": 20.231774935714288, "weightedJobsCyct": 18.419639289285712, "weightedJobsCart": 14.247341460714287, "PSPTt": 13.0, "PSCyct": 10.4, "PSCart": 8.4, "SSPTt": 19.3543986, "SSCyct": 16.8617592, "SSCart": 12.4665624, "FEPTt": 19.442017, "FECyct": 17.1153838, "FECart": 12.603893, "GPPTt": 13.8511262, "GPCyct": 11.6318938, "GPCart": 9.2772504, "HospPTt": 32.520103, "HospCyct": 27.7294392, "HospCart": 19.622974, "FoodPTt": 11.1550128, "FoodCyct": 9.6475216, "FoodCart": 8.0808512, "TownPTt": 17.8923002, "TownCyct": 14.8485474, "TownCart": 11.7936756 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -1.632371, 55.024824 ], [ -1.631598, 55.026226 ], [ -1.631137, 55.028791 ], [ -1.63088, 55.029713 ], [ -1.624743, 55.029074 ], [ -1.624496, 55.030211 ], [ -1.630998, 55.031404 ], [ -1.630268, 55.03454 ], [ -1.633444, 55.035721 ], [ -1.638594, 55.036606 ], [ -1.642971, 55.036876 ], [ -1.647692, 55.03668 ], [ -1.653872, 55.03486 ], [ -1.664944, 55.032499 ], [ -1.663227, 55.026399 ], [ -1.664686, 55.022905 ], [ -1.661038, 55.021503 ], [ -1.657434, 55.020691 ], [ -1.653099, 55.020421 ], [ -1.646533, 55.024652 ], [ -1.641769, 55.023963 ], [ -1.636362, 55.025046 ], [ -1.632371, 55.024824 ] ] ] } } +] +} diff --git a/importer/actdev_site.sh b/importer/actdev_site.sh index 90c04d7dea..982b9da55a 100755 --- a/importer/actdev_site.sh +++ b/importer/actdev_site.sh @@ -11,7 +11,7 @@ if [ "$SITE" == "" ]; then echo Missing args; exit 1; fi -CITY=${SITE/-/_} +CITY=`echo $SITE | sed -r 's/-/_/g'` cp -Rv importer/config/leeds importer/config/$CITY perl -pi -e "s#\"separate_cycleways\": false#\"separate_cycleways\": true#" importer/config/$CITY/cfg.json diff --git a/importer/config/aylesham/center.poly b/importer/config/aylesham/center.poly new file mode 100644 index 0000000000..217f5e08b0 --- /dev/null +++ b/importer/config/aylesham/center.poly @@ -0,0 +1,129 @@ +boundary +1 + 1.287577 51.209295 + 1.288744 51.208693 + 1.289858 51.208054 + 1.290917 51.207378 + 1.291918 51.206668 + 1.292858 51.205926 + 1.293735 51.205154 + 1.294545 51.204353 + 1.295287 51.203528 + 1.295958 51.202678 + 1.296558 51.201808 + 1.297083 51.200919 + 1.297533 51.200013 + 1.297906 51.199095 + 1.298202 51.198165 + 1.298419 51.197226 + 1.298557 51.196282 + 1.298616 51.195334 + 1.298595 51.194386 + 1.298494 51.19344 + 1.298315 51.192498 + 1.298056 51.191564 + 1.29772 51.190639 + 1.297306 51.189727 + 1.296816 51.18883 + 1.296252 51.187951 + 1.295615 51.187091 + 1.294906 51.186254 + 1.294129 51.185441 + 1.293284 51.184655 + 1.292375 51.183898 + 1.291403 51.183173 + 1.290372 51.18248 + 1.289284 51.181823 + 1.288142 51.181203 + 1.286951 51.180621 + 1.285712 51.18008 + 1.284429 51.179581 + 1.283106 51.179124 + 1.281747 51.178713 + 1.280355 51.178346 + 1.278935 51.178027 + 1.27749 51.177755 + 1.276023 51.177531 + 1.274541 51.177356 + 1.273045 51.17723 + 1.271541 51.177155 + 1.270033 51.177129 + 1.268525 51.177153 + 1.267021 51.177227 + 1.265525 51.177351 + 1.264042 51.177524 + 1.262575 51.177746 + 1.261129 51.178017 + 1.259707 51.178335 + 1.258314 51.178699 + 1.256954 51.179109 + 1.128074 51.220532 + 1.126769 51.220978 + 1.125502 51.221465 + 1.124278 51.221993 + 1.123098 51.22256 + 1.121967 51.223165 + 1.120887 51.223806 + 1.119862 51.224481 + 1.059556 51.266267 + 1.058576 51.266982 + 1.057657 51.267728 + 1.056802 51.268503 + 1.056012 51.269306 + 1.055291 51.270133 + 1.05464 51.270983 + 1.054061 51.271853 + 1.053555 51.272741 + 1.053124 51.273644 + 1.05277 51.274561 + 1.052492 51.275487 + 1.052292 51.276422 + 1.052171 51.277362 + 1.052128 51.278304 + 1.052165 51.279247 + 1.05228 51.280187 + 1.052473 51.281122 + 1.052744 51.28205 + 1.053093 51.282967 + 1.053518 51.283872 + 1.054018 51.284761 + 1.054591 51.285632 + 1.055237 51.286484 + 1.055953 51.287313 + 1.056737 51.288118 + 1.057588 51.288895 + 1.058502 51.289644 + 1.059478 51.290361 + 1.060513 51.291046 + 1.061603 51.291695 + 1.062746 51.292308 + 1.063939 51.292882 + 1.065178 51.293416 + 1.066461 51.293909 + 1.067783 51.294359 + 1.06914 51.294764 + 1.07053 51.295125 + 1.071948 51.295439 + 1.07339 51.295707 + 1.074853 51.295926 + 1.076332 51.296097 + 1.077823 51.296219 + 1.079323 51.296292 + 1.080826 51.296316 + 1.08233 51.29629 + 1.083829 51.296215 + 1.08532 51.29609 + 1.086798 51.295917 + 1.08826 51.295695 + 1.089701 51.295426 + 1.091118 51.295109 + 1.092506 51.294746 + 1.093862 51.294338 + 1.095182 51.293887 + 1.096463 51.293392 + 1.213641 51.245307 + 1.214588 51.244901 + 1.215508 51.24447 + 1.287577 51.209295 +END +END diff --git a/importer/config/aylesham/cfg.json b/importer/config/aylesham/cfg.json new file mode 100644 index 0000000000..a971115631 --- /dev/null +++ b/importer/config/aylesham/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/kent-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/culm/center.poly b/importer/config/culm/center.poly new file mode 100644 index 0000000000..2c334e3f2f --- /dev/null +++ b/importer/config/culm/center.poly @@ -0,0 +1,130 @@ +boundary +1 + -3.459374 50.70702 + -3.460146 50.706198 + -3.460985 50.705404 + -3.46189 50.704639 + -3.462858 50.703905 + -3.463886 50.703206 + -3.46497 50.702542 + -3.466109 50.701915 + -3.467299 50.701328 + -3.468536 50.700782 + -3.469817 50.700279 + -3.471139 50.69982 + -3.472497 50.699405 + -3.473888 50.699038 + -3.475308 50.698717 + -3.476752 50.698446 + -3.478217 50.698223 + -3.479699 50.69805 + -3.481193 50.697927 + -3.482695 50.697856 + -3.484201 50.697834 + -3.485707 50.697864 + -3.487208 50.697945 + -3.488701 50.698076 + -3.49018 50.698258 + -3.491642 50.698489 + -3.540095 50.707014 + -3.541498 50.707285 + -3.542876 50.707602 + -3.544227 50.707964 + -3.545547 50.70837 + -3.546831 50.708819 + -3.548078 50.709309 + -3.549282 50.70984 + -3.550442 50.710409 + -3.551554 50.711016 + -3.552615 50.711659 + -3.553623 50.712336 + -3.554573 50.713044 + -3.555465 50.713783 + -3.556295 50.714551 + -3.557062 50.715345 + -3.557763 50.716162 + -3.558396 50.717002 + -3.55896 50.717862 + -3.559453 50.718738 + -3.559875 50.71963 + -3.560222 50.720535 + -3.560496 50.721449 + -3.560694 50.722372 + -3.560818 50.7233 + -3.560865 50.72423 + -3.560836 50.725161 + -3.560732 50.72609 + -3.560552 50.727014 + -3.560296 50.72793 + -3.501619 50.910169 + -3.501282 50.911089 + -3.500868 50.911997 + -3.50038 50.91289 + -3.499818 50.913765 + -3.499184 50.91462 + -3.49848 50.915453 + -3.497708 50.916262 + -3.496869 50.917044 + -3.495967 50.917797 + -3.495003 50.918519 + -3.493981 50.919208 + -3.492903 50.919862 + -3.491772 50.920479 + -3.490591 50.921058 + -3.489364 50.921597 + -3.488093 50.922094 + -3.486783 50.922548 + -3.485437 50.922959 + -3.484059 50.923324 + -3.482652 50.923643 + -3.481221 50.923914 + -3.479769 50.924138 + -3.478301 50.924314 + -3.47682 50.92444 + -3.47533 50.924517 + -3.473836 50.924544 + -3.472342 50.924522 + -3.470852 50.92445 + -3.46937 50.924329 + -3.4679 50.924158 + -3.36825 50.910845 + -3.366783 50.910623 + -3.365336 50.910351 + -3.363913 50.910031 + -3.36252 50.909664 + -3.361159 50.909251 + -3.359836 50.908792 + -3.358552 50.90829 + -3.357312 50.907745 + -3.35612 50.90716 + -3.354979 50.906535 + -3.353892 50.905873 + -3.352862 50.905176 + -3.351892 50.904445 + -3.350985 50.903682 + -3.350143 50.90289 + -3.349368 50.902071 + -3.348664 50.901227 + -3.348031 50.90036 + -3.347472 50.899474 + -3.346989 50.89857 + -3.346582 50.897651 + -3.346252 50.89672 + -3.346001 50.895779 + -3.34583 50.89483 + -3.341145 50.860985 + -3.341053 50.860024 + -3.341042 50.85906 + -3.341113 50.858098 + -3.341266 50.85714 + -3.341499 50.856188 + -3.341812 50.855245 + -3.342205 50.854314 + -3.342676 50.853398 + -3.343223 50.8525 + -3.343846 50.851621 + -3.417846 50.754053 + -3.418686 50.753029 + -3.459374 50.70702 +END +END diff --git a/importer/config/culm/cfg.json b/importer/config/culm/cfg.json new file mode 100644 index 0000000000..62161c21c5 --- /dev/null +++ b/importer/config/culm/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/devon-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/dickens_heath/center.poly b/importer/config/dickens_heath/center.poly new file mode 100644 index 0000000000..1964b774a0 --- /dev/null +++ b/importer/config/dickens_heath/center.poly @@ -0,0 +1,129 @@ +boundary +1 + -1.807181 52.37221 + -1.808146 52.371464 + -1.809173 52.370751 + -1.810261 52.370072 + -1.811406 52.369429 + -1.812604 52.368824 + -1.813854 52.368259 + -1.81515 52.367735 + -1.81649 52.367253 + -1.817869 52.366816 + -1.819284 52.366424 + -1.820731 52.366078 + -1.822206 52.36578 + -1.823705 52.365529 + -1.825223 52.365328 + -1.826756 52.365176 + -1.828301 52.365074 + -1.829852 52.365022 + -1.831405 52.36502 + -1.832957 52.365068 + -1.834502 52.365167 + -1.836036 52.365315 + -1.837556 52.365513 + -1.839056 52.36576 + -1.840532 52.366055 + -1.841982 52.366398 + -1.843399 52.366787 + -1.844781 52.367221 + -1.846124 52.367699 + -1.852944 52.370278 + -1.854251 52.370802 + -1.855511 52.371369 + -1.856721 52.371975 + -1.857875 52.37262 + -1.858972 52.373302 + -1.860009 52.374018 + -1.860981 52.374767 + -1.861887 52.375547 + -1.862725 52.376355 + -1.86349 52.377189 + -1.864182 52.378047 + -1.864799 52.378927 + -1.865338 52.379825 + -1.865798 52.380739 + -1.866178 52.381667 + -1.866477 52.382607 + -1.866694 52.383554 + -1.866828 52.384508 + -1.866879 52.385464 + -1.866847 52.386421 + -1.866731 52.387375 + -1.866533 52.388324 + -1.866252 52.389265 + -1.86589 52.390196 + -1.865448 52.391114 + -1.864926 52.392016 + -1.864327 52.3929 + -1.849809 52.412779 + -1.8491 52.413682 + -1.848309 52.414559 + -1.84744 52.415408 + -1.846494 52.416226 + -1.769173 52.479192 + -1.768215 52.479929 + -1.767195 52.480635 + -1.766116 52.481308 + -1.76498 52.481945 + -1.763792 52.482544 + -1.762554 52.483105 + -1.761269 52.483626 + -1.759942 52.484105 + -1.758575 52.484541 + -1.757172 52.484932 + -1.755738 52.485278 + -1.754277 52.485578 + -1.752791 52.48583 + -1.751286 52.486035 + -1.749765 52.486191 + -1.748234 52.486298 + -1.746694 52.486357 + -1.745153 52.486366 + -1.743612 52.486325 + -1.742077 52.486236 + -1.740552 52.486097 + -1.73904 52.48591 + -1.737547 52.485675 + -1.736076 52.485393 + -1.734632 52.485064 + -1.733217 52.484689 + -1.731837 52.484269 + -1.730495 52.483806 + -1.729194 52.4833 + -1.727939 52.482754 + -1.726732 52.482168 + -1.725577 52.481545 + -1.724477 52.480885 + -1.723435 52.480191 + -1.722454 52.479465 + -1.721537 52.478708 + -1.720686 52.477923 + -1.719903 52.477112 + -1.719191 52.476277 + -1.718552 52.475421 + -1.717987 52.474545 + -1.717498 52.473652 + -1.717086 52.472745 + -1.716752 52.471826 + -1.716498 52.470897 + -1.716324 52.469962 + -1.71623 52.469022 + -1.716217 52.468081 + -1.716285 52.467141 + -1.716433 52.466204 + -1.716661 52.465273 + -1.716969 52.46435 + -1.717355 52.463439 + -1.717819 52.462541 + -1.718359 52.46166 + -1.718974 52.460796 + -1.719662 52.459954 + -1.767579 52.404877 + -1.768327 52.404066 + -1.769144 52.40328 + -1.770025 52.402521 + -1.807181 52.37221 +END +END diff --git a/importer/config/dickens_heath/cfg.json b/importer/config/dickens_heath/cfg.json new file mode 100644 index 0000000000..99536bcf55 --- /dev/null +++ b/importer/config/dickens_heath/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/west-midlands-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/dunton_hills/center.poly b/importer/config/dunton_hills/center.poly new file mode 100644 index 0000000000..2ed81567f0 --- /dev/null +++ b/importer/config/dunton_hills/center.poly @@ -0,0 +1,127 @@ +boundary +1 + 0.269005 51.467237 + 0.26773 51.466727 + 0.266414 51.46626 + 0.26506 51.465837 + 0.263673 51.465458 + 0.262256 51.465126 + 0.260812 51.464841 + 0.259347 51.464603 + 0.257864 51.464414 + 0.256367 51.464274 + 0.25486 51.464183 + 0.253348 51.464142 + 0.251834 51.464151 + 0.250323 51.464209 + 0.248819 51.464317 + 0.247326 51.464474 + 0.245849 51.46468 + 0.244391 51.464934 + 0.242956 51.465235 + 0.241548 51.465583 + 0.240172 51.465977 + 0.238831 51.466416 + 0.237528 51.466898 + 0.236268 51.467422 + 0.235054 51.467987 + 0.233889 51.468591 + 0.232777 51.469232 + 0.231719 51.469909 + 0.230721 51.47062 + 0.229783 51.471362 + 0.22891 51.472134 + 0.228102 51.472934 + 0.227363 51.473759 + 0.226694 51.474608 + 0.226098 51.475477 + 0.225576 51.476364 + 0.225129 51.477268 + 0.224759 51.478185 + 0.224466 51.479113 + 0.224252 51.480049 + 0.224117 51.480991 + 0.224062 51.481935 + 0.224086 51.482881 + 0.22419 51.483824 + 0.224374 51.484763 + 0.224636 51.485694 + 0.224976 51.486616 + 0.225393 51.487525 + 0.225886 51.488419 + 0.226454 51.489295 + 0.227095 51.490152 + 0.227807 51.490986 + 0.228589 51.491796 + 0.229438 51.49258 + 0.393819 51.635411 + 0.394744 51.636168 + 0.395732 51.636894 + 0.39678 51.637586 + 0.397886 51.638243 + 0.399046 51.638863 + 0.400257 51.639443 + 0.401516 51.639983 + 0.402819 51.64048 + 0.404162 51.640934 + 0.405542 51.641343 + 0.406955 51.641706 + 0.408397 51.642022 + 0.409864 51.64229 + 0.411352 51.64251 + 0.412856 51.64268 + 0.414372 51.6428 + 0.415897 51.642871 + 0.417425 51.642891 + 0.418953 51.64286 + 0.420476 51.64278 + 0.421991 51.642649 + 0.423492 51.642469 + 0.424975 51.642239 + 0.426437 51.641961 + 0.427874 51.641635 + 0.42928 51.641263 + 0.430653 51.640844 + 0.431988 51.640382 + 0.433283 51.639875 + 0.434532 51.639327 + 0.435733 51.638738 + 0.436882 51.638111 + 0.437976 51.637447 + 0.439012 51.636748 + 0.439987 51.636015 + 0.440899 51.635252 + 0.441744 51.634459 + 0.493609 51.582859 + 0.494385 51.582038 + 0.495091 51.581193 + 0.495723 51.580325 + 0.49628 51.579438 + 0.496762 51.578534 + 0.497166 51.577615 + 0.497491 51.576684 + 0.497736 51.575744 + 0.497902 51.574797 + 0.497986 51.573846 + 0.497989 51.572893 + 0.497912 51.571942 + 0.497754 51.570994 + 0.497515 51.570053 + 0.497197 51.569122 + 0.4968 51.568202 + 0.496325 51.567296 + 0.495775 51.566408 + 0.495149 51.565538 + 0.49445 51.564691 + 0.493681 51.563868 + 0.492842 51.563072 + 0.491937 51.562304 + 0.490968 51.561567 + 0.489938 51.560863 + 0.48885 51.560195 + 0.487706 51.559563 + 0.48651 51.55897 + 0.485266 51.558417 + 0.269005 51.467237 +END +END diff --git a/importer/config/dunton_hills/cfg.json b/importer/config/dunton_hills/cfg.json new file mode 100644 index 0000000000..d71355bff6 --- /dev/null +++ b/importer/config/dunton_hills/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/essex-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/hampton/center.poly b/importer/config/hampton/center.poly new file mode 100644 index 0000000000..3ce76619eb --- /dev/null +++ b/importer/config/hampton/center.poly @@ -0,0 +1,129 @@ +boundary +1 + -0.255303 52.521344 + -0.256524 52.520755 + -0.257794 52.520206 + -0.25911 52.519699 + -0.260469 52.519236 + -0.261865 52.518816 + -0.263295 52.518442 + -0.264756 52.518115 + -0.266244 52.517835 + -0.267753 52.517603 + -0.26928 52.517421 + -0.270821 52.517287 + -0.272372 52.517204 + -0.273927 52.517171 + -0.275483 52.517187 + -0.277036 52.517254 + -0.27858 52.517371 + -0.280112 52.517537 + -0.281628 52.517753 + -0.283123 52.518017 + -0.284593 52.518328 + -0.286034 52.518687 + -0.287443 52.519091 + -0.288814 52.519541 + -0.290144 52.520034 + -0.29143 52.520569 + -0.292668 52.521144 + -0.293854 52.521759 + -0.327371 52.540065 + -0.328485 52.540706 + -0.329542 52.541381 + -0.330541 52.542088 + -0.331479 52.542826 + -0.332352 52.543593 + -0.333159 52.544386 + -0.333897 52.545204 + -0.334564 52.546044 + -0.33516 52.546904 + -0.335681 52.547781 + -0.336127 52.548674 + -0.336496 52.54958 + -0.336787 52.550497 + -0.337 52.551421 + -0.337134 52.552351 + -0.337189 52.553284 + -0.337164 52.554217 + -0.33706 52.555148 + -0.336876 52.556075 + -0.336614 52.556994 + -0.336274 52.557904 + -0.335857 52.558803 + -0.335364 52.559686 + -0.334796 52.560553 + -0.334155 52.561401 + -0.333442 52.562227 + -0.332661 52.56303 + -0.331811 52.563807 + -0.3055 52.586558 + -0.304558 52.587327 + -0.303551 52.588064 + -0.302481 52.588768 + -0.30135 52.589435 + -0.300162 52.590065 + -0.298921 52.590656 + -0.29763 52.591205 + -0.296293 52.591712 + -0.294913 52.592174 + -0.293494 52.592591 + -0.292041 52.592961 + -0.290558 52.593284 + -0.289049 52.593557 + -0.22593 52.603876 + -0.224418 52.604097 + -0.222889 52.604269 + -0.221347 52.604392 + -0.219797 52.604465 + -0.218242 52.604489 + -0.216688 52.604462 + -0.215138 52.604386 + -0.213597 52.60426 + -0.212068 52.604085 + -0.210557 52.603861 + -0.209068 52.603589 + -0.207604 52.603269 + -0.20617 52.602903 + -0.20477 52.602492 + -0.203407 52.602036 + -0.202085 52.601537 + -0.200809 52.600996 + -0.199581 52.600416 + -0.198405 52.599796 + -0.197284 52.59914 + -0.196222 52.598449 + -0.19522 52.597724 + -0.194283 52.596969 + -0.193413 52.596184 + -0.192612 52.595373 + -0.191882 52.594537 + -0.191225 52.593679 + -0.190643 52.592801 + -0.190139 52.591905 + -0.189712 52.590995 + -0.189365 52.590072 + -0.189098 52.589139 + -0.188912 52.5882 + -0.188807 52.587255 + -0.188784 52.586308 + -0.188844 52.585362 + -0.188985 52.584419 + -0.189207 52.583482 + -0.18951 52.582554 + -0.189893 52.581636 + -0.190354 52.580732 + -0.190893 52.579844 + -0.191508 52.578975 + -0.192197 52.578126 + -0.192959 52.577301 + -0.237703 52.53162 + -0.238593 52.530766 + -0.23956 52.529944 + -0.240601 52.529157 + -0.241714 52.528406 + -0.242894 52.527695 + -0.244137 52.527025 + -0.255303 52.521344 +END +END diff --git a/importer/config/hampton/cfg.json b/importer/config/hampton/cfg.json new file mode 100644 index 0000000000..d0869bccbb --- /dev/null +++ b/importer/config/hampton/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/cambridgeshire-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/micklefield/center.poly b/importer/config/micklefield/center.poly new file mode 100644 index 0000000000..5c07e03ff4 --- /dev/null +++ b/importer/config/micklefield/center.poly @@ -0,0 +1,129 @@ +boundary +1 + -1.323614 53.811424 + -1.322032 53.811359 + -1.320458 53.811245 + -1.318897 53.811083 + -1.317352 53.810872 + -1.315827 53.810615 + -1.314328 53.81031 + -1.312857 53.80996 + -1.311419 53.809564 + -1.310018 53.809125 + -1.308658 53.808643 + -1.307342 53.80812 + -1.306074 53.807557 + -1.304858 53.806955 + -1.303696 53.806316 + -1.302593 53.805643 + -1.30155 53.804936 + -1.300571 53.804198 + -1.299659 53.803431 + -1.298815 53.802637 + -1.298043 53.801817 + -1.297344 53.800975 + -1.29672 53.800112 + -1.296173 53.799232 + -1.295704 53.798335 + -1.295316 53.797426 + -1.295008 53.796505 + -1.294781 53.795577 + -1.294637 53.794642 + -1.294575 53.793705 + -1.294597 53.792766 + -1.2947 53.79183 + -1.294887 53.790898 + -1.295155 53.789974 + -1.295504 53.789058 + -1.295933 53.788155 + -1.296442 53.787266 + -1.297028 53.786395 + -1.29769 53.785542 + -1.298426 53.784711 + -1.299234 53.783904 + -1.300113 53.783123 + -1.301059 53.782371 + -1.30207 53.781648 + -1.303143 53.780958 + -1.304276 53.780302 + -1.305465 53.779682 + -1.306707 53.779099 + -1.307998 53.778556 + -1.309336 53.778053 + -1.310716 53.777593 + -1.312135 53.777175 + -1.313588 53.776802 + -1.315073 53.776475 + -1.316584 53.776193 + -1.318118 53.775959 + -1.319671 53.775773 + -1.321237 53.775635 + -1.322814 53.775545 + -1.324397 53.775504 + -1.325981 53.775513 + -1.54674 53.779874 + -1.548324 53.779928 + -1.549901 53.780032 + -1.551467 53.780184 + -1.553017 53.780384 + -1.554547 53.780632 + -1.556054 53.780927 + -1.557532 53.781268 + -1.558979 53.781655 + -1.560389 53.782086 + -1.561759 53.782559 + -1.563086 53.783075 + -1.564365 53.783631 + -1.565594 53.784226 + -1.566768 53.784858 + -1.567885 53.785525 + -1.568942 53.786227 + -1.569935 53.786959 + -1.570862 53.787722 + -1.571721 53.788512 + -1.572509 53.789328 + -1.573224 53.790167 + -1.573863 53.791027 + -1.574426 53.791906 + -1.574911 53.792801 + -1.575315 53.79371 + -1.57564 53.79463 + -1.575882 53.795558 + -1.576042 53.796493 + -1.576119 53.797432 + -1.576114 53.798372 + -1.576025 53.79931 + -1.575854 53.800244 + -1.5756 53.801172 + -1.575265 53.802091 + -1.574849 53.802998 + -1.574353 53.803891 + -1.57378 53.804767 + -1.573129 53.805624 + -1.572404 53.80646 + -1.571606 53.807273 + -1.570737 53.808059 + -1.5698 53.808818 + -1.568797 53.809546 + -1.567731 53.810243 + -1.566605 53.810905 + -1.565422 53.811532 + -1.564185 53.812122 + -1.562898 53.812672 + -1.561564 53.813182 + -1.560187 53.813649 + -1.55877 53.814074 + -1.557317 53.814454 + -1.555833 53.814788 + -1.554322 53.815076 + -1.552787 53.815317 + -1.551233 53.81551 + -1.549663 53.815655 + -1.548084 53.815751 + -1.546498 53.815798 + -1.54491 53.815796 + -1.387296 53.813032 + -1.386948 53.813024 + -1.323614 53.811424 +END +END diff --git a/importer/config/micklefield/cfg.json b/importer/config/micklefield/cfg.json new file mode 100644 index 0000000000..f0f7e1d903 --- /dev/null +++ b/importer/config/micklefield/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/west-yorkshire-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/importer/config/newcastle_great_park/center.poly b/importer/config/newcastle_great_park/center.poly new file mode 100644 index 0000000000..e6cccec719 --- /dev/null +++ b/importer/config/newcastle_great_park/center.poly @@ -0,0 +1,131 @@ +boundary +1 + -1.593399 54.976336 + -1.593253 54.975393 + -1.593193 54.974448 + -1.593219 54.973501 + -1.593333 54.972557 + -1.593532 54.971617 + -1.593817 54.970685 + -1.594187 54.969763 + -1.594642 54.968853 + -1.595178 54.967959 + -1.595796 54.967081 + -1.596493 54.966224 + -1.597268 54.965389 + -1.598118 54.964579 + -1.599041 54.963795 + -1.600034 54.963041 + -1.601095 54.962318 + -1.602221 54.961628 + -1.603408 54.960972 + -1.604654 54.960354 + -1.605954 54.959775 + -1.607306 54.959235 + -1.608705 54.958738 + -1.610147 54.958283 + -1.611629 54.957873 + -1.613147 54.957508 + -1.614696 54.957189 + -1.616272 54.956918 + -1.61787 54.956695 + -1.619487 54.956521 + -1.621117 54.956396 + -1.622757 54.956321 + -1.624401 54.956295 + -1.626045 54.956319 + -1.627685 54.956393 + -1.629315 54.956517 + -1.630932 54.95669 + -1.632531 54.956911 + -1.634108 54.957181 + -1.635658 54.957498 + -1.637176 54.957862 + -1.638659 54.958271 + -1.640103 54.958724 + -1.641503 54.959221 + -1.642856 54.959759 + -1.644158 54.960337 + -1.645405 54.960955 + -1.708061 54.993607 + -1.709247 54.994257 + -1.710372 54.994943 + -1.711433 54.995661 + -1.712427 54.99641 + -1.713351 54.997189 + -1.714203 54.997994 + -1.714981 54.998823 + -1.715681 54.999675 + -1.716304 55.000547 + -1.716846 55.001437 + -1.717305 55.002341 + -1.717682 55.003258 + -1.717975 55.004186 + -1.718183 55.00512 + -1.718305 55.00606 + -1.718341 55.007002 + -1.718291 55.007944 + -1.718156 55.008884 + -1.717934 55.009817 + -1.717628 55.010743 + -1.717238 55.011658 + -1.716765 55.012561 + -1.71621 55.013448 + -1.715575 55.014316 + -1.714861 55.015165 + -1.714072 55.015991 + -1.713207 55.016792 + -1.712271 55.017566 + -1.711265 55.01831 + -1.710193 55.019023 + -1.709057 55.019703 + -1.684832 55.033454 + -1.684696 55.033531 + -1.66936 55.042123 + -1.66817 55.042756 + -1.666925 55.043352 + -1.665627 55.043911 + -1.66428 55.04443 + -1.662888 55.044909 + -1.661455 55.045345 + -1.659985 55.045738 + -1.658481 55.046087 + -1.656947 55.046391 + -1.655389 55.046648 + -1.653808 55.046859 + -1.652212 55.047023 + -1.650602 55.047138 + -1.648984 55.047206 + -1.647362 55.047225 + -1.645741 55.047196 + -1.644124 55.047119 + -1.642517 55.046994 + -1.640923 55.046821 + -1.639347 55.046601 + -1.637793 55.046334 + -1.636265 55.046022 + -1.634767 55.045664 + -1.633303 55.045262 + -1.631878 55.044817 + -1.630495 55.044331 + -1.629158 55.043804 + -1.62787 55.043237 + -1.626635 55.042633 + -1.625457 55.041994 + -1.624337 55.04132 + -1.62328 55.040613 + -1.622289 55.039876 + -1.621365 55.039111 + -1.620511 55.038319 + -1.61973 55.037502 + -1.619024 55.036664 + -1.618395 55.035806 + -1.601395 55.010817 + -1.600849 55.00995 + -1.600382 55.009067 + -1.599994 55.008172 + -1.599687 55.007266 + -1.599461 55.006353 + -1.593399 54.976336 +END +END diff --git a/importer/config/newcastle_great_park/cfg.json b/importer/config/newcastle_great_park/cfg.json new file mode 100644 index 0000000000..847700e6ed --- /dev/null +++ b/importer/config/newcastle_great_park/cfg.json @@ -0,0 +1,18 @@ +{ + "osm_url": "https://download.geofabrik.de/europe/great-britain/england/tyne-and-wear-latest.osm.pbf", + "map_config": { + "driving_side": "Left", + "bikes_can_use_bus_lanes": false, + "inferred_sidewalks": true, + "separate_cycleways": true, + "street_parking_spot_length": 8.0 + }, + "onstreet_parking": "JustOSM", + "public_offstreet_parking": "None", + "private_offstreet_parking": { + "FixedPerBldg": 3 + }, + "elevation": null, + "include_railroads": true, + "extra_buildings": null +} diff --git a/map_gui/src/tools/mod.rs b/map_gui/src/tools/mod.rs index c86d88ec0e..1b3e332408 100644 --- a/map_gui/src/tools/mod.rs +++ b/map_gui/src/tools/mod.rs @@ -73,6 +73,7 @@ pub fn nice_map_name(name: &MapName) -> &str { ("allerton_bywater", "center") => "Allerton Bywater", ("ashton_park", "center") => "Ashton Park", ("aylesbury", "center") => "Aylesbury", + ("aylesham", "center") => "Aylesham", ("bailrigg", "center") => "Bailrigg (Lancaster)", ("bath_riverside", "center") => "Bath Riverside", ("bellevue", "huge") => "Bellevue", @@ -81,10 +82,14 @@ pub fn nice_map_name(name: &MapName) -> &str { ("castlemead", "center") => "Castlemead", ("chapelford", "center") => "Chapelford (Cheshire)", ("clackers_brook", "center") => "Clackers Brook", + ("culm", "center") => "Culm", ("detroit", "downtown") => "Detroit", + ("dickens_heath", "center") => "Dickens Heath", ("didcot", "center") => "Didcot (Harwell)", + ("dunton_hills", "center") => "Dunton Hills", ("ebbsfleet", "center") => "Ebbsfleet (Dartford)", ("great_kneighton", "center") => "Great Kneighton (Cambridge)", + ("hampton", "center") => "Hampton", ("kidbrooke_village", "center") => "Kidbrooke Village", ("krakow", "center") => "Kraków (city center)", ("leeds", "central") => "Leeds (city center)", @@ -93,7 +98,9 @@ pub fn nice_map_name(name: &MapName) -> &str { ("leeds", "west") => "West Leeds", ("london", "southbank") => "London (Southbank)", ("long_marston", "center") => "Long Marston (Stratford)", + ("micklefield", "center") => "Micklefield", ("montreal", "plateau") => "Montréal (Plateau)", + ("newcastle_great_park", "center") => "Newcastle Great Park", ("nyc", "lower_manhattan") => "Lower Manhattan", ("nyc", "midtown_manhattan") => "Midtown Manhattan", ("paris", "center") => "Paris (city center)", diff --git a/release/deploy_actdev.sh b/release/deploy_actdev.sh index 83e1abf48e..635ce5612a 100755 --- a/release/deploy_actdev.sh +++ b/release/deploy_actdev.sh @@ -17,7 +17,7 @@ cd .. # Copy just what's needed from data mkdir abst_actdev/system # TODO This'll be easier once we further organize by country code -for dir in allerton_bywater ashton_park aylesbury bailrigg bath_riverside bicester castlemead chapelford clackers_brook didcot ebbsfleet great_kneighton handforth kidbrooke_village lcid long_marston; do +for dir in allerton_bywater ashton_park aylesbury aylesham bailrigg bath_riverside bicester castlemead chapelford clackers_brook culm dickens-heath didcot dunton_hills ebbsfleet great_kneighton hampton handforth kidbrooke_village lcid long_marston micklefield newcastle_great_park; do cp -Rv data/system/$dir abst_actdev/system done cp -Rv data/system/study_areas abst_actdev/system