Merge branch 'master' of https://github.com/boundlessgeo/desktop-lessons

General_tasks/Create_spatial_bookmarks/bookmark_name_raleigh.html

@@ -20,5 +20,5 @@
     <img src="bookmark_name_raleigh.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Create_spatial_bookmarks/bookmark_name_wake.html

@@ -20,5 +20,5 @@
     <img src=bookmark_name_wake.png>
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Create_spatial_bookmarks/introduction.html

@@ -13,5 +13,5 @@
     QGIS allows the user to create spatial bookmarks to store locations on the map canvas. These locations are saved as map canvas' spatial extents in the QGIS project and can be used to quickly navigate on the map. In this lessons, we will cover bookmark creation.
 </p>
 <p>
-    Click <b>Move to next step</b> when you are ready to start.
+    Click <b>Next step</b> when you are ready to start.
 </p>

General_tasks/Create_spatial_bookmarks/use_bookmarks.html

@@ -26,5 +26,5 @@
 <p>
     Try repeating the above steps but for the <i>Wake county</i> bookmark. After doing it, the map canvas should now show the Wake County full territory.</p>
 <p>
-    Once you are done, click <b>Move to next step</b> to finish the lesson.
+    Once you are done, click <b>Next step</b> to finish the lesson.
 </p>

General_tasks/Create_spatial_bookmarks/zoom_to_raleigh.html

@@ -19,5 +19,5 @@
     <img src="zoom_to_raleigh.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Create_visibility_presets/changelayervisibility.html

@@ -24,5 +24,5 @@
     </p>    
 </ol>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p

General_tasks/Create_visibility_presets/createpreset1.html

@@ -32,5 +32,5 @@
 <p>
     You have created a new preset called <i>Services points</i>. In the next steps, we will create another one.</p>
 <p>
-    Once you are ready, click <b>Move to next step</b>.
+    Once you are ready, click <b>Next step</b>.
 </p>

General_tasks/Create_visibility_presets/createpreset2.html

@@ -33,5 +33,5 @@
     You have created a new preset called <i>Heatmap only</i>.
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Create_visibility_presets/usepresets.html

@@ -30,5 +30,5 @@
     Try going back to the <i>Heatmap only</i> preset by your own.
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b> to end the lesson.
+    Once you have finished, click <b>Next step</b> to end the lesson.
 </p>

General_tasks/Define_vector_layer_CRS/__init__.py

@@ -4,29 +4,18 @@
 # This code is licensed under the GPL 2.0 license.
 #
 from lessons.lesson import Lesson, Step
-from lessons.utils import *
+from lessons.utils import setActiveLayer, layerActive
 from qgis.utils import iface
 from lessons import addLessonModule
 
-def isLayerActive():
-    layer = iface.activeLayer()
-    return layer is not None and layer.name() == "Wake_BlockGroup_2010"
-
-def setActiveLayer():
-    layer = layerFromName("Wake_BlockGroup_2010")
-    iface.setActiveLayer(layer)
-
 lesson = Lesson("Define vector layer CRS", "General tasks", "lesson.html")
 
 lesson.addStep("Set 'Wake_BlockGroup_2010' layer as active layer", "activelayer.html",
-               function = setActiveLayer, endcheck = isLayerActive, steptype = Step.MANUALSTEP)
-
+               function=lambda: setActiveLayer("Wake_BlockGroup_2010"),
+               endcheck=lambda: layerActive("Wake_BlockGroup_2010"),
+               steptype=Step.MANUALSTEP)
 lesson.addMenuClickStep("Layer/Set CRS of Layer(s)")
-
 lesson.addStep("Set the layer's correct CRS", "setcrs.html", steptype=Step.MANUALSTEP)
-
 lesson.addMenuClickStep("Vector/Data Management Tools/Define Current Projection...", "gotodefineprojection.html")
-
 lesson.addStep("Define new CRS to file", "defineprojection.html", steptype=Step.MANUALSTEP)
-
-lesson.addNextLesson("General tasks", "Reproject vector layer")
+lesson.addNextLesson("General tasks", "Reproject vector layer")

General_tasks/Define_vector_layer_CRS/activelayer.html

@@ -19,7 +19,7 @@
             One way of fixing it is to set the correct CRS within the project. Let's do it.
         </p>
         <p>
-            On the <b>Layers Panel</b>:
+            In the <b>Layers Panel</b>:
         </p>
         <ol>
             <li>
@@ -33,7 +33,7 @@
             <img src='activelayer.png'/>
         </p>
         <p>
-            Once you have finished, click <b>Move to next step</b>.
+            Once you have finished, click <b>Next step</b>.
         </p>
     </body>
 </html>

General_tasks/Define_vector_layer_CRS/defineprojection.html

@@ -37,7 +37,7 @@
             The CRS is saved on the original data, and the layer will no longer load into QGIS with a wrong CRS.
         </p>
         <p>
-            Once you have finished, click <b>Move to next step</b>, to end the lesson.
+            Once you have finished, click <b>Next step</b>, to end the lesson.
         </p>
     </body>
 </html>

General_tasks/Define_vector_layer_CRS/setcrs.html

@@ -34,7 +34,7 @@
             The new CRS is set, and the layer should now fit the Wake County's Boundary.
         </p>
         <p>
-            Once you have finished, click <b>Move to next step</b>.
+            Once you have finished, click <b>Next step</b>.
         </p>
     </body>
 </html>

General_tasks/Export_raster_layer/opentranslate.html

@@ -19,7 +19,7 @@
             <li>Click on the <b>Raster > Conversion > Translate (Convert Format)...</b> menu entry.</li>
         </ol>
         <p>    
-            Once you have finished, click <b>Move to next step</b>.
+            Once you have finished, click <b>Next step</b>.
         </p>
     </body>
 </html>

General_tasks/Export_raster_layer/saveas.html

@@ -36,5 +36,5 @@
     The new file will be saved in the new format, and loaded into the map canvas.
 </p>
 <p>
-    Once you are done, click <b>Move to next step</b> to finish the lesson.
+    Once you are done, click <b>Next step</b> to finish the lesson.
 </p>

General_tasks/Export_raster_layer_using_Processing/opentranslate.html

@@ -28,5 +28,5 @@
 </ol>
 
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Export_raster_layer_using_Processing/runtranslate.html

@@ -39,5 +39,5 @@
     The new file will be saved in the new format and loaded into the map canvas.
 </p>
 <p>
-    Once you are done, click <b>Move to next step</b> to finish the lesson.
+    Once you are done, click <b>Next step</b> to finish the lesson.
 </p>

General_tasks/Export_vector_layer/__init__.py

@@ -4,21 +4,16 @@
 # This code is licensed under the GPL 2.0 license.
 #
 from lessons.lesson import Lesson, Step
-from lessons.utils import *
+from lessons.utils import setActiveLayer, layerActive
 from qgis.utils import iface
 from lessons import addLessonModule
 
-def isLayerActive():
-    layer = iface.activeLayer()
-    return layer is not None and layer.name() == "points"
-
-def setActiveLayer():
-    layer = layerFromName("points")
-    iface.setActiveLayer(layer)
 
 lesson = Lesson("Export vector layer", "General tasks", "lesson.html")
 lesson.addStep("Set 'points' layer as active layer", "activelayer.html",
-               function = setActiveLayer, endcheck=isLayerActive, steptype=Step.MANUALSTEP)
+               function=lambda: setActiveLayer("points"),
+               endcheck=lambda: layerActive("points"),
+               steptype=Step.MANUALSTEP)
 lesson.addMenuClickStep("Layer/Save As...")
 lesson.addStep("Save layer to new format", "saveas.html", steptype=Step.MANUALSTEP)
 lesson.addNextLesson("General tasks", "Reproject vector layer")

General_tasks/Export_vector_layer/activelayer.html

@@ -25,7 +25,7 @@
             <img src='activelayer.png'/>
         </p>
         <p>
-            Once you have finished, click <b>Move to next step</b>.
+            Once you have finished, click <b>Next step</b>.
         </p>
     </body>
 </html>

General_tasks/Export_vector_layer/saveas.html

@@ -32,7 +32,7 @@
     </ol>
 <p>The new layer will load in the map canvas.</p>
 <p>
-    Once you are done, click <b>Move to next step</b> to finish the lesson.
+    Once you are done, click <b>Next step</b> to finish the lesson.
 </p>
 </body>
 </html>

General_tasks/Group_layers/addlayer.html

@@ -22,5 +22,5 @@
     <img src="heatmapingroup.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Group_layers/groupselected.html

@@ -30,5 +30,5 @@
 <img src="groupedlayers.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Group_layers/removelayer.html

@@ -33,5 +33,5 @@
     <img src="schoolsoutgroup.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b> to end the lesson.
+    Once you have finished, click <b>Next step</b> to end the lesson.
 </p>

General_tasks/Group_layers/renamegroup.html

@@ -31,5 +31,5 @@
     <img src="groupnewname.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Group_layers/selectlayers.html

@@ -22,5 +22,5 @@
     <img src="activelayers.png">
 </p>
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Reproject_vector_layer/__init__.py

@@ -4,21 +4,16 @@
 # This code is licensed under the GPL 2.0 license.
 #
 from lessons.lesson import Lesson, Step
-from lessons.utils import *
+from lessons.utils import setActiveLayer, layerActive
 from qgis.utils import iface
 from lessons import addLessonModule
 
-def isLayerActive():
-    layer = iface.activeLayer()
-    return layer is not None and layer.name() == "points"
-
-def setActiveLayer():
-    layer = layerFromName("points")
-    iface.setActiveLayer(layer)
 
 lesson = Lesson("Reproject vector layer", "General tasks", "lesson.html")
 lesson.addStep("Set 'points' layer as active layer", "activelayer.html",
-               function = setActiveLayer, endcheck=isLayerActive, steptype=Step.MANUALSTEP)
+               function=lambda: setActiveLayer("points"),
+               endcheck=lambda: layerActive("points"),
+               steptype=Step.MANUALSTEP)
 lesson.addMenuClickStep("Layer/Properties...", "openproperties.html")
 lesson.addStep("Confirm layer CRS", "confirmcrs.html", steptype=Step.MANUALSTEP)
 lesson.addMenuClickStep("Layer/Save As...")

General_tasks/Reproject_vector_layer/activelayer.html

@@ -25,7 +25,7 @@
             <img src='activelayer.png'/>
         </p>
         <p>
-            Once you have finished, click <b>Move to next step</b>.
+            Once you have finished, click <b>Next step</b>.
         </p>
     </body>
 </html>

General_tasks/Reproject_vector_layer/confirmcrs.html

@@ -28,5 +28,5 @@
         </li>
     </ol>
 <p>
-    Once you are done, click <b>Move to next step</b> to continue the lesson.
+    Once you are done, click <b>Next step</b> to continue the lesson.
 </p>

General_tasks/Reproject_vector_layer/saveas.html

@@ -35,7 +35,7 @@
     </ol>
 <p>The new reprojected layer will load in the map canvas.</p>
 <p>
-    Once you are done, click <b>Move to next step</b> to finish the lesson.
+    Once you are done, click <b>Next step</b> to finish the lesson.
 </p>
 
 </body>

General_tasks/Reproject_vector_layer_using_Processing/openreprojecttool.html

@@ -28,5 +28,5 @@
 </ol>
 
 <p>
-    Once you have finished, click <b>Move to next step</b>.
+    Once you have finished, click <b>Next step</b>.
 </p>

General_tasks/Transform_X_and_Y_CSV_table_into_a_point_vector_layer/__init__.py

@@ -3,21 +3,18 @@
 from qgis.utils import iface
 from lessons import addLessonModule
 
-lesson = Lesson ("Transform X and Y CSV table into a point vector layer",
-                 "General tasks", "lesson.html")
 
 def copyTable():
-	filepath = os.path.join(os.path.dirname(os.path.dirname(__file__)), "transformcsv/data", "songs.csv")
-	copyLessonData(filepath, os.path.basename(os.path.dirname(__file__)))
+    filepath = os.path.join(os.path.dirname(os.path.dirname(__file__)), "Transform_X_and_Y_CSV_table_into_a_point_vector_layer/data", "songs.csv")
+    copyLessonData(filepath, os.path.basename(os.path.dirname(__file__)))
 
-lesson.addStep("Copy data", "Copy data", copyTable)
 
-lesson.addMenuClickStep('Layer/Add Layer/Add Delimited Text Layer...')
+lesson = Lesson ("Transform X and Y CSV table into a point vector layer",
+                 "General tasks", "lesson.html")
 
+lesson.addStep("Copy data", "Copy data", copyTable)
+lesson.addMenuClickStep('Layer/Add Layer/Add Delimited Text Layer...')
 lesson.addStep('Configure importing settings', 'delimited_test_settings.html', steptype=Step.MANUALSTEP)
-
 lesson.addStep('Set layer as active layer', 'set_active_layer.html', steptype=Step.MANUALSTEP)
-
 lesson.addMenuClickStep('Layer/Save As...')
-
 lesson.addStep('Save the file as GeoPackage', 'save_as_geopackage.html', steptype=Step.MANUALSTEP)

General_tasks/Using_preview_modes_in_map_canvas/colorblindness.html

@@ -16,5 +16,5 @@
     <img src="protanope.png">
 </p>
 <p>
-    Click <b>Move to next step</b> to try the other two preview modes.
+    Click <b>Next step</b> to try the other two preview modes.
 </p>

General_tasks/Using_preview_modes_in_map_canvas/end.html

@@ -13,5 +13,5 @@
     As we have seen, some color choices can lead to accessibility problems. Therefore, in those cases, we should change our color schemes or add extra symbols to make the map useful for everyone. I advise you to consult <b>http://colorbrewer2.org</b> to choose more adequated color schemes for your maps and use preview modes to make sure they work.
 </p>
 <p>
-    Click <b>Move to next step</b> to finish the lesson.
+    Click <b>Next step</b> to finish the lesson.
 </p>

General_tasks/Using_preview_modes_in_map_canvas/grayscale.html

@@ -16,5 +16,5 @@
     <img src="grayscale.png">
 </p>
 <p>
-    Click <b>Move to next step</b> once you are ready to continue.
+    Click <b>Next step</b> once you are ready to continue.
 </p>

General_tasks/Using_preview_modes_in_map_canvas/introduction.html

@@ -13,5 +13,5 @@
     This lesson will show you how to use map canvas preview modes to anticipate how your map will look in limited color spaces. Grayscale formats and color blindness are examples of that. This feature is useful to avoid choosing colors that will make the map unreadable to some or all its users.
 </p>
 <p>
-    Click <b>Move to next step</b> whenever you are ready to start.
+    Click <b>Next step</b> whenever you are ready to start.
 </p>

General_tasks/lesson.manifest

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <lesson>
    <description>Lessons about general/common tasks in QGIS</description>
-   <lessons_list>Add annotations to the map canvas,Add decorations to the map canvas,Create spatial bookmarks,Create visibility presets,Define vector layer CRS,Export raster layer,Export raster layer using Processing,Export vector layer,Group layers,reprojectvector,Reproject vector layer,Reproject vector layer using Processing,Save map canvas as a georeferenced image,transformcsv,Transform X and Y CSV table into a point vector layer,Using preview modes in map canvas</lessons_list>
+   <lessons_list>Define vector layer CRS,Save map canvas as a georeferenced image,Create spatial bookmarks,Export raster layer,Add decorations to the map canvas,Add annotations to the map canvas,Transform X and Y CSV table into a point vector layer,Export vector layer,Reproject vector layer,Reproject vector layer using Processing,Create visibility presets,Using preview modes in map canvas,Export raster layer using Processing,Group layers</lessons_list>
    <url>http://lessons.connect.boundlessgeo.com/general.zip</url>
 </lesson>

layer_styling/Create_proportional_symbols/00_lesson.html

@@ -0,0 +1,5 @@
+<h1>Categorized Symbols</h1>
+<p>A good way of representing quantitative data values is using symbols which size is proportional to a variable's value. QGIS allows the user to style a layer with proportional symbols in a convenient — but still customizable — way. This lesson will show how to create proportional symbols using the QGIS's size assistant.</p>
+<p><b>Estimated time:</b> 5 minutes</p>
+<p><b>Lesson by:</b> Alexandre Neto</p>
+<p><img src='../_shared_images/boundless.png'/></p>