Merge branch 'master' into turf-buffer-admin-function

# Conflicts: # package.json
dcfemtech · Aug 20, 2016 · d5cca36 · d5cca36
2 parents f489094 + f44bbb0
commit d5cca36
Show file tree

Hide file tree

Showing 19 changed files with 1,157 additions and 2,084 deletions.
diff --git a/README.md b/README.md
@@ -23,8 +23,9 @@ At the moment there are no tests. Nevertheless, if you run `npm test` this will
 
 | Location | URL | Description |
 |----------|-----|-------------|
-| Montgomery County, MD | [Bikeways from dataMontgomery](https://data.montgomerycountymd.gov/Transportation/Bikeways/icc2-ppee) | "Separated and marked bike lanes, bike-friendly shoulders, signed and sharrowed on-road routes, paved" |
-| Fairfax County, VA | [Bicycle routes from Fairfax GIS Data](http://data.fairfaxcountygis.opendata.arcgis.com/datasets/0dacd6f1e697469a81d6f7292a78d30e_16?geometry=-77.32%2C38.826%2C-77.24%2C38.846) | This is a list of "suggested bike routes" (roads under 35mph) and not true bike lanes so we have excluded this data set from the project. |
-| Arlington County, VA | [Bike routes from Arlington County GIS Data](http://gisdata.arlgis.opendata.arcgis.com/datasets/af497e2747104622ac74f4457b3fb73f_4?geometry=-77.295%2C38.81%2C-76.87%2C38.89) | We filtered by "Off Street Trail" and "Marked Route". |
-| Alexandria City, VA | [Bike trails from Alexandria Open GIS Data Portal](http://data.alexgis.opendata.arcgis.com/datasets/685dfe61f1aa477f8cbd21dceb5ba9b5_0) | "Collection of trails within the City of Alexandria, Virginia. Shows trail features categorized by on street, off street, and sharrow (bike lane marked)." |
-| Prince George's County, MD | [Master Plan Trails from PGAtlas](http://www.pgatlas.com/?mapID=3b60528c-dddf-4958-9107-d4c458c295c1) & [Bike Trails Layer from MWCOG](http://gis.mwcog.org/wa/rest/services/RTDC/PGCTrails/MapServer/0) | Data was not easily extractable from the open data portal and as a result was not included in this project. |
+| Montgomery County, MD | [Bikeways from dataMontgomery](https://data.montgomerycountymd.gov/Transportation/Bikeways/icc2-ppee) | Filtered by category = "Paved Off-Road Trail" or "Bike Lanes" or "Separated Bike Lanes" |
+| Fairfax County, VA | [Bicycle routes from Fairfax GIS Data](http://data.fairfaxcountygis.opendata.arcgis.com/datasets/0dacd6f1e697469a81d6f7292a78d30e_16?geometry=-77.32%2C38.826%2C-77.24%2C38.846) | This is a list of "suggested bike routes" (based on Bicycle Level of Service) and not true bike lanes so we have excluded this data set from the project. |
+| Arlington County, VA | [Bike routes from Arlington County GIS Data](http://gisdata.arlgis.opendata.arcgis.com/datasets/af497e2747104622ac74f4457b3fb73f_4?geometry=-77.295%2C38.81%2C-76.87%2C38.89) | Filtered by Route_Type = "Off Street Trail" or "Marked Route". |
+| Alexandria City, VA | [Bike trails from Alexandria Open GIS Data Portal](http://data.alexgis.opendata.arcgis.com/datasets/685dfe61f1aa477f8cbd21dceb5ba9b5_0) | Filtered by (TRAILTYPE = "Off Street" or "On Street") and SHARROW = "No" |
+| Prince George's County, MD | [Master Plan Trails from PG Planning Open Data Portal](http://gisdata.pgplanning.org/opendata/downloadzip.asp?FileName=/data/ShapeFile/Master_Plan_Trail_Ln.zip) | Filtered by FACILITY_S = "Existing" AND "FACILITY_T = "Bike Lane" OR "FACILITY_T" = "Hard Surface Trail" |
+| Washington, DC | [Bicycle Lanes from opendata.dc.gov](http://opendata.dc.gov/datasets/294e062cdf2c48d5b9cbc374d9709bc0_2) and [Bike Trails from opendata.dc.gov](http://opendata.dc.gov/datasets/e8c2b7ef54fb43d9a2ed1b0b75d0a14d_4) | Filtered by FACILITY = "Existing Bike Lane" OR "Climbing Lane" OR "Contraflow Bike Lane" or "Cycle Track" |
diff --git a/bikelanes/DC_Bike_Lanes.geojson b/bikelanes/DC_Bike_Lanes.geojson
diff --git a/bikelanes/DC_Bike_Paths_All.geojson b/bikelanes/DC_Bike_Paths_All.geojson
diff --git a/bikelanes/DC_Bike_Trails.geojson b/bikelanes/DC_Bike_Trails.geojson
diff --git a/bikelanes/DC_Washington.geojson b/bikelanes/DC_Washington.geojson
diff --git a/bikelanes/MD_MontgomeryCounty.geojson b/bikelanes/MD_MontgomeryCounty.geojson
diff --git a/bikelanes/MD_MontgomeryCounty_Bikeways.geojson b/bikelanes/MD_MontgomeryCounty_Bikeways.geojson
diff --git a/bikelanes/MD_PrinceGeorgesCounty.geojson b/bikelanes/MD_PrinceGeorgesCounty.geojson
diff --git a/bikelanes/MD_PrinceGeorgesCounty_Bikeways.geojson b/bikelanes/MD_PrinceGeorgesCounty_Bikeways.geojson
diff --git a/bikelanes/VA_Alexandria.geojson b/bikelanes/VA_Alexandria.geojson
diff --git a/bikelanes/VA_Alexandria_Bike.geojson b/bikelanes/VA_Alexandria_Bike.geojson
diff --git a/bikelanes/VA_Arlington.geojson b/bikelanes/VA_Arlington.geojson
diff --git a/bikelanes/VA_Arlington_Bike.geojson b/bikelanes/VA_Arlington_Bike.geojson
diff --git a/bikelanes/VA_FairfaxCounty_Bike.geojson b/bikelanes/VA_FairfaxCounty_Bike.geojson
diff --git a/index.html b/index.html
@@ -1,28 +1,94 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset=utf-8 />
-<title>DC Bike Infrastructure</title>
-
-<link href='https://www.mapbox.com/base/latest/base.css' rel='stylesheet' />
-<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no' />
-<script src='https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.css' rel='stylesheet' />
-<link href='styles.css' rel='stylesheet' />
+    <!-- ======= params ======= -->
+    <meta charset=utf-8 />
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>WABA Bike Infrastructure Map Project</title>
+
+    <!-- ======= mapbox ======= -->
+    <link rel="stylesheet" href="https://www.mapbox.com/base/latest/base.css" />
+    <link rel="stylesheet" href="https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.css" />
+
+    <!-- ======= styles ======= -->
+    <link rel="stylesheet" href="styles.css" />
 </head>
 
 <body>
-<div id='map'></div>
-<div class='pin-top fill-gray pad1'>
-    Areas within 
-    <select name='distance' id='radius'>
-        <option value='500' selected='selected'>500 feet</option>
-        <option value='1000'>1000 feet</option>
-        <option value='2500'>2500 feet</option>
-        <option value='5280'>1 mile</option>
-    </select>
-    of a bike lane or protected bike infrastructure.
-</div>
-<script src='site.js'></script>
+
+    <!-- ======= info ======= -->
+    <div id="info">
+        <h2 class="header-text">location</h2>
+        <div id="loc">
+            <p>latitude:  <span id="lat">&nbsp;</span></p>
+            <p>longitude:  <span id="lng">&nbsp;</span></p>
+        </div>
+    </div>
+
+    <!-- ======= menu ======= -->
+    <div class="menu">
+        <div id="dragBar">
+            <h3 class="menu-label">menu</h3>
+        </div>
+        <div id="hoverText"></div>
+        <table id="filters">
+            <tr class="table-header">
+                <th class="td-r"><span class="filter-label">regions</span></th>
+                <th class="td-b" colspan="4"><span class="filter-label">buffers</span></td>
+            </tr>
+            <tr id="clearAll">
+                <td class="td-r"><div id="clearAll-r"><p class="label-x">all</p></div></td>
+                <td class="td-b" colspan="4">&nbsp;</td>
+            </tr>
+
+            <!-- ======= regions ======= -->
+            <tr id="AL">
+                <td class="td-r"><div class="region"><p class="label-r">AL</p></div></td>
+                <td class="td-b"><div class="buffer ft500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft1000">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft2500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft5280">&nbsp;</div></td>
+            </tr>
+            <tr id="AR">
+                <td class="td-r"><div class="region"><p class="label-r">AR</p></div></td>
+                <td class="td-b"><div class="buffer ft500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft1000">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft2500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft5280">&nbsp;</div></td>
+            </tr>
+            <tr id="DC">
+                <td class="td-r"><div class="region"><p class="label-r">DC</p></div></td>
+                <td class="td-b"><div class="buffer ft500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft1000">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft2500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft5280">&nbsp;</div></td>
+            </tr>
+            <tr id="MO">
+                <td class="td-r"><div class="region"><p class="label-r">MO</p></div></td>
+                <td class="td-b"><div class="buffer ft500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft1000">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft2500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft5280">&nbsp;</div></td>
+            </tr>
+            <tr id="PG">
+                <td class="td-r"><div class="region"><p class="label-r">PG</p></div></td>
+                <td class="td-b"><div class="buffer ft500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft1000">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft2500">&nbsp;</div></td>
+                <td class="td-b"><div class="buffer ft5280">&nbsp;</div></td>
+            </tr>
+        </table>
+        <div class="locText start">&nbsp;</div><span class="filter-label">start</span>
+        <div class="locText end">&nbsp;</div><span class="filter-label">end</span>
+    </div>
+
+    <!-- ======= map ======= -->
+    <div id="map"></div>
+
+    <script src="https://code.jquery.com/jquery-1.12.4.js" integrity="sha256-Qw82+bXyGq6MydymqBxNPYTaUXXq7c8v3CwiYwLLNXU=" crossorigin="anonymous"></script>
+    <script src="https://api.tiles.mapbox.com/mapbox.js/v2.4.0/mapbox.js"></script>
+    <script src='site.js'></script>
+
 </body>
-</html>
+</html>
diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "start": "serve",
     "test": "eslint -c .eslintrc *.js",
-    "buffers": "node --max-old-space-size=8192 scripts/generate-buffers.js"
+    "buffers": "node --max-old-space-size=8192 scripts/generate-buffers.js",
+    "fetch": "node scripts/fetch.js"
   },
   "repository": {
     "type": "git",
@@ -32,6 +33,7 @@
     "d3-queue": "^3.0.2",
     "eslint": "^3.3.0",
     "serve": "^1.4.0",
-    "turf": "^3.0.14"
+    "turf": "^3.0.14",
+    "request": "^2.74.0"
   }
 }