update code for fall 2018

libjohn · libjohn · commit a5e39b5d3210 · 2018-10-22T17:37:52.000-04:00
diff --git a/02_choropleth.Rmd b/02_choropleth.Rmd
@@ -69,7 +69,7 @@ Make choropleth by filling county polygons (census geography) with correlated va
 nc_pop %>%
     st_transform(crs = "+init=epsg:4326") %>%
     leaflet(width = "100%") %>%
-    addProviderTiles(provider = "CartoDB.Positron") %>%
+    addProviderTiles(provider = "Stamen.TonerLines") %>%
     addPolygons(popup = ~ str_extract(NAME, "^([^,]*)"),
                 stroke = FALSE,
                 smoothFactor = 0,
@@ -105,7 +105,7 @@ Generate the map with multiple layers.
 nc_pop %>%
     st_transform(crs = "+init=epsg:4326") %>%
     leaflet(width = "100%") %>%
-    addProviderTiles(provider = "CartoDB.Positron") %>%
+    addProviderTiles(provider = "Stamen.TonerLines") %>%
     addPolygons(popup = ~ str_extract(NAME, "^([^,]*)"),
                 stroke = FALSE,
                 smoothFactor = 0,
diff --git a/032_thematic_mapping_geom_sf.Rmd b/032_thematic_mapping_geom_sf.Rmd
@@ -55,11 +55,10 @@ BlsWage_ToJoin <- Salary4Helpers %>%
 
 As before, using the `append_data()` function of the `tmaptools` package, append BLS data to the previously loaded shape object
 
-```{}
-HelperShapeObject <- append_data(us_geo, BlsWage_ToJoin, 
-                                 key.shp = "NAME",
-                                 key.data = "State")
-as_tibble(HelperShapeObject)
+``` r
+HelperShapeObject <- us_geo %>% 
+  left_join(BlsWage_ToJoin,
+            by = c("NAME" = "State"))
 ```
 
 
diff --git a/answers-2_tidycensus.Rmd b/answers-2_tidycensus.Rmd
@@ -76,7 +76,7 @@ Make choropleth by filling county polygons (census geography) with correlated va
 census_variable %>%
     st_transform(crs = "+init=epsg:4326") %>%
     leaflet(width = "100%") %>%
-    addProviderTiles(provider = "CartoDB.Positron") %>%
+    addProviderTiles(provider = "Stamen.TonerLines") %>%
     addPolygons(popup = ~ str_extract(NAME, "^([^,]*)"),
                 stroke = FALSE,
                 smoothFactor = 0,
@@ -130,7 +130,7 @@ MapPalette <- colorBin(palette = "viridis",
 census_variable %>%
     st_transform(crs = "+init=epsg:4326") %>%
     leaflet(width = "100%") %>%
-    addProviderTiles(provider = "CartoDB.Positron") %>%
+    addProviderTiles(provider = "Stamen.TonerLines") %>%
     addPolygons(popup = ~ str_extract(NAME, "^([^,]*)"),
                 stroke = FALSE,
                 smoothFactor = 0,
@@ -170,7 +170,7 @@ MapPalette <- colorNumeric(palette = "viridis",
 census_variable %>%
     st_transform(crs = "+init=epsg:4326") %>%
     leaflet(width = "100%") %>%
-    addProviderTiles(provider = "CartoDB.Positron") %>%
+    addProviderTiles(provider = "Stamen.TonerLines") %>%
     addPolygons(popup = ~ str_extract(NAME, "^([^,]*)"),
                 stroke = FALSE,
                 smoothFactor = 0,
diff --git a/docs/01_georeference.html b/docs/01_georeference.html
diff --git a/docs/02_choropleth.html b/docs/02_choropleth.html
diff --git a/docs/032_thematic_mapping_geom_sf.html b/docs/032_thematic_mapping_geom_sf.html
@@ -456,10 +456,9 @@ <h2>Wrangle the data</h2>
 <div id="append-data" class="section level2">
 <h2>Append data</h2>
 <p>As before, using the <code>append_data()</code> function of the <code>tmaptools</code> package, append BLS data to the previously loaded shape object</p>
-<pre><code>HelperShapeObject &lt;- append_data(us_geo, BlsWage_ToJoin, 
-                                 key.shp = &quot;NAME&quot;,
-                                 key.data = &quot;State&quot;)
-as_tibble(HelperShapeObject)</code></pre>
+<div class="sourceCode"><pre class="sourceCode r"><code class="sourceCode r">HelperShapeObject &lt;-<span class="st"> </span>us_geo <span class="op">%&gt;%</span><span class="st"> </span>
+<span class="st">  </span><span class="kw">left_join</span>(BlsWage_ToJoin,
+            <span class="dt">by =</span> <span class="kw">c</span>(<span class="st">&quot;NAME&quot;</span> =<span class="st"> &quot;State&quot;</span>))</code></pre></div>
 </div>
 <div id="contiguous-48-states" class="section level2">
 <h2>Contiguous 48 states</h2>
diff --git a/docs/033_thematic_leaflet_example.html b/docs/033_thematic_leaflet_example.html
diff --git a/docs/answers-1_xy-leaflet.html b/docs/answers-1_xy-leaflet.html
@@ -338,8 +338,8 @@ <h3>Plot XY on the Map</h3>
 <span class="st">  </span><span class="kw">addMarkers</span>(<span class="dt">lat =</span> <span class="op">~</span>Latitude, 
              <span class="dt">lng =</span> <span class="op">~</span>Longitude, 
              <span class="dt">popup =</span> xy_locations<span class="op">$</span>Company)</code></pre></div>
-<div id="htmlwidget-17fee30cfc27e6cc0fda" style="width:100%;height:480px;" class="leaflet html-widget"></div>
-<script type="application/json" data-for="htmlwidget-17fee30cfc27e6cc0fda">{"x":{"options":{"crs":{"crsClass":"L.CRS.EPSG3857","code":null,"proj4def":null,"projectedBounds":null,"options":{}}},"calls":[{"method":"addTiles","args":["//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",null,null,{"minZoom":0,"maxZoom":18,"tileSize":256,"subdomains":"abc","errorTileUrl":"","tms":false,"noWrap":false,"zoomOffset":0,"zoomReverse":false,"opacity":1,"zIndex":1,"detectRetina":false,"attribution":"&copy; <a href=\"http://openstreetmap.org\">OpenStreetMap<\/a> contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA<\/a>"}]},{"method":"addMarkers","args":[[40.2487413,-7.9110809,9.49858,-7.0320658,-17.0490108,21.8693003,53.3323703,31.394935,30.274084,14.1313261],[72.1297653,111.4253892,50.8105261,108.4365067,-41.5612423,106.7691712,-6.2152673,92.835795,120.15507,122.8277624],null,null,null,{"interactive":true,"draggable":false,"keyboard":true,"title":"","alt":"","zIndexOffset":0,"opacity":1,"riseOnHover":false,"riseOffset":250},["Ailane","Thoughtbeat","Lazz","Zoomdog","Minyx","Devpulse","Meembee","Quamba","Realcube","Fatz"],null,null,null,null,{"interactive":false,"permanent":false,"direction":"auto","opacity":1,"offset":[0,0],"textsize":"10px","textOnly":false,"className":"","sticky":true},null]}],"limits":{"lat":[-17.0490108,53.3323703],"lng":[-41.5612423,122.8277624]}},"evals":[],"jsHooks":[]}</script>
+<div id="htmlwidget-58e7bf340d6667624cf3" style="width:100%;height:480px;" class="leaflet html-widget"></div>
+<script type="application/json" data-for="htmlwidget-58e7bf340d6667624cf3">{"x":{"options":{"crs":{"crsClass":"L.CRS.EPSG3857","code":null,"proj4def":null,"projectedBounds":null,"options":{}}},"calls":[{"method":"addTiles","args":["//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",null,null,{"minZoom":0,"maxZoom":18,"tileSize":256,"subdomains":"abc","errorTileUrl":"","tms":false,"noWrap":false,"zoomOffset":0,"zoomReverse":false,"opacity":1,"zIndex":1,"detectRetina":false,"attribution":"&copy; <a href=\"http://openstreetmap.org\">OpenStreetMap<\/a> contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA<\/a>"}]},{"method":"addMarkers","args":[[40.2487413,-7.9110809,9.49858,-7.0320658,-17.0490108,21.8693003,53.3323703,31.394935,30.274084,14.1313261],[72.1297653,111.4253892,50.8105261,108.4365067,-41.5612423,106.7691712,-6.2152673,92.835795,120.15507,122.8277624],null,null,null,{"interactive":true,"draggable":false,"keyboard":true,"title":"","alt":"","zIndexOffset":0,"opacity":1,"riseOnHover":false,"riseOffset":250},["Ailane","Thoughtbeat","Lazz","Zoomdog","Minyx","Devpulse","Meembee","Quamba","Realcube","Fatz"],null,null,null,null,{"interactive":false,"permanent":false,"direction":"auto","opacity":1,"offset":[0,0],"textsize":"10px","textOnly":false,"className":"","sticky":true},null]}],"limits":{"lat":[-17.0490108,53.3323703],"lng":[-41.5612423,122.8277624]}},"evals":[],"jsHooks":[]}</script>
 </div>
 </div>
 
diff --git a/docs/answers-2_tidycensus.html b/docs/answers-2_tidycensus.html
diff --git a/docs/index.html b/docs/index.html
@@ -274,6 +274,8 @@
 
 
 <p> </p>
+<p><a href="slides"><strong>Slides</strong></a></p>
+<p><a href="https://github.com/libjohn/map-fall2018">Code for Hands-on Workshop – Fall 2018</a></p>
 <div id="overview" class="section level2">
 <h2>Overview</h2>
 <p>These learning and quick-reference resource pages support the face-to-face workshop, <em>Mapping with R</em>, offered via the <a href="https://library.duke.edu/data/">Data &amp; Visualization Services</a> Department, Duke University Libraries. The exercises and workshop are designed to help you learn georeferencing, make a <a href="https://en.wikipedia.org/wiki/Choropleth_map">choropleth</a> with USA census data via the <a href="https://walkerke.github.io/tidycensus/">tidycensus</a> package, and briefly introducing the <a href="http://r-spatial.github.io/sf/">simple features for R</a> package. The introduction of these very useful R packages and some very basic concepts will give you enough information to make your own customized thematic maps.</p>
diff --git a/docs/netlify.toml b/docs/netlify.toml
@@ -0,0 +1,10 @@
+# COMMENT: redirect rules with all the fields expanded
+# According to netlify domain management
+# https://app.netlify.com/sites/mapping/settings/domain#custom-domains
+# # Redirect default Netlify subdomain to primary domain
+# https://mapping.netlify.com/* https://map-rfun.library.duke.edu/:splat 301!
+[[redirects]]
+  from = "https://mapping.netlify.com/*"
+  to = "https://map-rfun.library.duke.edu/:splat"
+  status = 301
+  force = true
diff --git a/docs/software_prereqs.html b/docs/software_prereqs.html
@@ -466,7 +466,7 @@ <h2>Session Info</h2>
 ##  language (EN)                        
 ##  collate  English_United States.1252  
 ##  tz       America/New_York            
-##  date     2018-10-15</code></pre>
+##  date     2018-10-22</code></pre>
 <pre><code>## Packages -----------------------------------------------------------------</code></pre>
 <pre><code>##  package      * version   date       source        
 ##  assertthat     0.2.0     2017-04-11 CRAN (R 3.5.1)
diff --git a/index.Rmd b/index.Rmd
@@ -5,6 +5,10 @@ output:
 ---
 &nbsp;
 
+[**Slides**](slides)
+
+[Code for Hands-on Workshop -- Fall 2018](https://github.com/libjohn/map-fall2018)
+
 ## Overview
 
 These learning and quick-reference resource pages support the face-to-face workshop, _Mapping with R_, offered via the [Data & Visualization Services](https://library.duke.edu/data/) Department, Duke University Libraries. The exercises and workshop are designed to help you learn georeferencing, make a  [choropleth](https://en.wikipedia.org/wiki/Choropleth_map) with USA census data via the [tidycensus](https://walkerke.github.io/tidycensus/) package, and briefly introducing the [simple features for R](http://r-spatial.github.io/sf/) package. The introduction of these very useful R packages and some very basic concepts will give you enough information to make your own customized thematic maps.
