diff --git a/docs/training_manual/appendix/contribute.rst b/docs/training_manual/appendix/contribute.rst index 580865fa064..ee06c914294 100644 --- a/docs/training_manual/appendix/contribute.rst +++ b/docs/training_manual/appendix/contribute.rst @@ -76,7 +76,7 @@ The module-level index file will look like this: :: ******************************************************************************* - |MOD| Module Name + Module: Module Name ******************************************************************************* Short paragraph describing the module. @@ -104,7 +104,7 @@ To add a lesson to a new or existing module: .. note:: For editing purposes, a :kbd:`.rst` file works exactly like a normal text file (:kbd:`.txt`). -* To begin writing the lesson, write the markup phrase :kbd:`|LS|`, followed by +* To begin writing the lesson, write the markup phrase ``Lesson:``, followed by the lesson name. * In the next line, write a line of 80 equal signs (:kbd:`=`). * Leave a line open after this. @@ -137,14 +137,14 @@ There are two types of sections: "follow along" and "try yourself". assignment, and will show the expected outcome if possible. Every section comes with a difficulty level. An easy section is denoted by -:kbd:`|basic|`, moderate by :kbd:`|moderate|`, and advanced by :kbd:`|hard|`. +``★☆☆``, moderate by ``★★☆``, and advanced by ``★★★``. Adding a "follow along" section ------------------------------------------------------------------------------- * To start this section, write the markup phrase of the intended difficulty level (as shown above). -* Leave a space and then write :kbd:`|FA|` (for "follow along"). +* Leave a space and then write ``Follow Along:``. * Leave another space and write the name of the section (use only an initial capital letter, as well as capitals for proper nouns). * In the next line, write a line of 80 minuses/dashes (:kbd:`-`). Ensure that @@ -162,8 +162,8 @@ Adding a "try yourself" section * To start this section, write the markup phrase of the intended difficulty level (as shown above). -* Leave a space and then write :kbd:`|TY|` (for "try yourself"). -* In the next line, write a line of 80 minuses/dashes (:kbd:`-`). Ensure that +* Leave a space and then write ``Try Yourself:``. +* In the next line, write a line of 80 minuses/dashes (``-``). Ensure that your text editor does not replace the default minus/dash character with a long dash or other character. * Explain the exercise that you want the reader to complete. Refer to previous @@ -212,23 +212,23 @@ below it, otherwise it could cause errors while creating the document. Add a Conclusion =============================================================================== -* To end a lesson, write the phrase :kbd:`|IC|` for "in conclusion", followed - by a new line of 80 minuses/dashes (:kbd:`-`). Write a conclusion for the +* To end a lesson, write the phrase ``In Conclusion``, followed + by a new line of 80 minuses/dashes (``-``). Write a conclusion for the lesson, explaining which concepts have been covered in the lesson. Add a Further Reading Section =============================================================================== * This section is optional. -* Write the phrase :kbd:`FR` for "further reading", followed by a new line of - 80 minuses/dashes (:kbd:`-`). +* Write the phrase ``Further Reading``, followed by a new line of + 80 minuses/dashes (``-``). * Include links to appropriate external websites. Add a What's Next Section =============================================================================== -* Write the phrase :kbd:`|WN|` for "what's next", followed by a new line of 80 - minuses/dashes (:kbd:`-`). +* Write the phrase ``What's Next?`` for "what's next", followed by a new line of 80 + minuses/dashes (``-``). * Explain how this lesson has prepared students for the next lesson or module. * Remember to change the "what's next" section of the previous lesson if necessary, so that it refers to your new lesson. This will be necessary if @@ -366,20 +366,3 @@ Thank You! Thank you for contributing to this project! By so doing, you are making QGIS more accessible to users and adding value to the QGIS project as a whole. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |MOD| replace:: Module: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/appendix/preparing_data.rst b/docs/training_manual/appendix/preparing_data.rst index cbb886c235f..61439945936 100644 --- a/docs/training_manual/appendix/preparing_data.rst +++ b/docs/training_manual/appendix/preparing_data.rst @@ -21,7 +21,7 @@ more complex data sources which may or may not be available for your region. .. note:: These instructions assume you have a good knowledge of QGIS and are not intended to be used as teaching material. -|hard| |TY| Create OSM based vector files +:abbr:`★★★ (Advanced level)` Try Yourself: Create OSM based vector files -------------------------------------------------------------------------------- If you wish to replace the default data set with localised data for your course, @@ -175,7 +175,7 @@ are added to the map): The important thing is that you have 7 vector layers matching those shown above and that all those layers have some data. -|hard| |TY| Create SRTM DEM tiff files +:abbr:`★★★ (Advanced level)` Try Yourself: Create SRTM DEM tiff files -------------------------------------------------------------------------------- For modules :ref:`tm_create_vector_data` and :ref:`tm_rasters`, you'll also need @@ -195,7 +195,7 @@ Keep the :file:`GeoTiff` format. Once the form is filled, click on the Once you have downloaded the required file(s), they should be saved in the :file:`exercise_data` directory, under :file:`raster/SRTM` subfolders. -|hard| |TY| Create imagery tiff files +:abbr:`★★★ (Advanced level)` Try Yourself: Create imagery tiff files -------------------------------------------------------------------------------- @@ -212,7 +212,7 @@ For reference, the image in the example data is: :align: center -|basic| |TY| Replace tokens +:abbr:`★☆☆ (Basic level)` Try Yourself: Replace tokens -------------------------------------------------------------------------------- Having created your localized dataset, the final step is to replace the tokens @@ -239,11 +239,8 @@ The tokens you need to replace are as follows: please add it also to the substitutions.txt file in the source folder. -.. |TY| replace:: Try Yourself -.. |basic| image:: /static/common/basic.png .. |extents| image:: /static/common/extents.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |indicatorMemory| image:: /static/common/mIndicatorMemory.png :width: 1.5em .. |majorUrbanName| replace:: Swellendam diff --git a/docs/training_manual/assessment/index.rst b/docs/training_manual/assessment/index.rst index 5af31be6ef0..0e7ba7756ab 100644 --- a/docs/training_manual/assessment/index.rst +++ b/docs/training_manual/assessment/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Assessment +Module: Assessment ******************************************************************************* Use your own data for this section. You will need: @@ -24,7 +24,7 @@ Add the point layer * Add in the point layer. Based on the level that you're doing the course at, do only what is listed in the appropriate section below: -|basic| +:abbr:`★☆☆ (Basic level)` ............................................................................... * Label the points according to a unique attribute, such as place names. Use a @@ -34,17 +34,17 @@ Add the point layer For example, categories could include "tourist destination", "police station", and "town center". -|moderate| +:abbr:`★★☆ (Moderate level)` ............................................................................... -* Do the same as the |basic| section. +* Do the same as the :abbr:`★☆☆ (Basic level)` section. * Classify the point size by importance: the more significant a feature, the larger its point. However, don't exceed the point size of :kbd:`2.00`. * For features that aren't located at a single point (for example, provincial/regional names, or town names at a large scale), don't assign any point at all. -|hard| +:abbr:`★★★ (Advanced level)` ............................................................................... * Don't use point symbols to symbolize the layer at all. Instead, use labels @@ -61,13 +61,13 @@ Add the line layer * Add the road layer and then change its symbology. Don't label the roads. -|basic| +:abbr:`★☆☆ (Basic level)` ............................................................................... * Change the road symbology to a light color with a broad line. Make it somewhat transparent as well. -|moderate| +:abbr:`★★☆ (Moderate level)` ............................................................................... * Create a symbol with multiple symbol layers. The resulting symbol should look @@ -81,10 +81,10 @@ Add the line layer * All symbols should have multiple symbol layers. Use symbols to make them display correctly. -|hard| +:abbr:`★★★ (Advanced level)` ............................................................................... -* Do the same as in the |moderate| section above. +* Do the same as in the :abbr:`★★☆ (Moderate level)` section above. * In addition, roads should be classified. When using realistic road-like symbols, each type of road should have an appropriate symbol; for example, a highway should appear to have two lanes in either direction. @@ -94,19 +94,19 @@ Add the polygon layer * Add the land use layer and change its symbology. -|basic| +:abbr:`★☆☆ (Basic level)` ............................................................................... * Classify the layer according to land use. Use solid colors. -|moderate| +:abbr:`★★☆ (Moderate level)` ............................................................................... * Classify the layer according to land use. Where appropriate, incorporate symbol layers, different symbol types, etc. Keep the results looking subdued and uniform, however. Keep in mind that this will be part of a backdrop! -|hard| +:abbr:`★★★ (Advanced level)` ............................................................................... * Use rule-based classification to classify the land use into general @@ -138,7 +138,7 @@ Analyze the data * it should be within a given distance from some category of points, like a hospital for example -|moderate| / |hard| +:abbr:`★★☆ (Moderate level)` / :abbr:`★★★ (Advanced level)` ------------------------------------------------------------------------------- * Include raster analysis in your results. Consider at least one derived @@ -153,15 +153,3 @@ Final Map map has become too visually busy due to the added layer(s), deselect the layers which you feel are the least necessary. * Your map must include a title and a legend. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/basic_map/index.rst b/docs/training_manual/basic_map/index.rst index 72d1cbe9275..e8486d23650 100644 --- a/docs/training_manual/basic_map/index.rst +++ b/docs/training_manual/basic_map/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Creating and Exploring a Basic Map +Module: Creating and Exploring a Basic Map ******************************************************************************* In this module, you will create a basic map which will be used later as a basis @@ -12,12 +12,3 @@ for further demonstrations of QGIS functionality. preparation mapviewnavigation symbology - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/basic_map/mapviewnavigation.rst b/docs/training_manual/basic_map/mapviewnavigation.rst index 008466fa752..511f88fce4b 100644 --- a/docs/training_manual/basic_map/mapviewnavigation.rst +++ b/docs/training_manual/basic_map/mapviewnavigation.rst @@ -1,4 +1,4 @@ -|LS| Navigating the Map Canvas +Lesson: Navigating the Map Canvas =============================================================================== This section will focus on basic QGIS navigation tools used to navigate within the Map Canvas. These tools will allow you to visually explore the layers at @@ -7,7 +7,7 @@ different scales. **The goal for this lesson:** Learn how to use Pan and Zoom tools within QGIS and learn about map scale. -|basic| |FA| Basic Navigation Tools +:abbr:`★☆☆ (Basic level)` Follow Along: Basic Navigation Tools ------------------------------------------------------------------------------- Before learning how to navigate within the Map Canvas, let's add some @@ -98,7 +98,7 @@ Now you know the basics of navigating the Map Canvas. Check out the User Manual :ref:`Zooming and Panning` to learn about alternative ways of navigating the Map Canvas. -|IC| +In Conclusion ------------------------------------------------------------------------------- Knowing how to navigate the Map Canvas is important, as it allows one to explore @@ -111,10 +111,6 @@ or to validate output of a spatial analysis. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |basic| image:: /static/common/basic.png .. |pan| image:: /static/common/mActionPan.png :width: 1.5em .. |zoomFullExtent| image:: /static/common/mActionZoomFullExtent.png diff --git a/docs/training_manual/basic_map/overview.rst b/docs/training_manual/basic_map/overview.rst index 817933b9769..86d93d7ae8d 100644 --- a/docs/training_manual/basic_map/overview.rst +++ b/docs/training_manual/basic_map/overview.rst @@ -1,4 +1,4 @@ -|LS| An Overview of the Interface +Lesson: An Overview of the Interface =============================================================================== We will explore the QGIS user interface so that you are familiar with the @@ -8,7 +8,7 @@ the interface. **The goal for this lesson:** To understand the basics of the QGIS user interface. -|basic| |TY|: The Basics +:abbr:`★☆☆ (Basic level)` Try Yourself:: The Basics ------------------------------------------------------------------------------- .. _figure_gui_numbered: @@ -28,7 +28,7 @@ The elements identified in the figure above are: .. Don't reorder these list items! They refer to elements as numbered on an image. -|basic| The Layers List +:abbr:`★☆☆ (Basic level)` The Layers List ............................................................................... In the Layers list, you can see a list, at any time, of all the layers @@ -50,7 +50,7 @@ will be using some of them before long, so take a look around! .. _browser_panel_tm: -|basic| The Browser Panel +:abbr:`★☆☆ (Basic level)` The Browser Panel ............................................................................... The QGIS Browser is a panel in QGIS that lets you easily navigate in your @@ -71,7 +71,7 @@ Favorite``. You should then be able to see your folder in the |favourites| long name: don't worry right-click on the path and choose ``Rename Favorite...`` to set another name. -|basic| Toolbars +:abbr:`★☆☆ (Basic level)` Toolbars ............................................................................... Your most often used sets of tools can be turned into toolbars for basic access. @@ -86,7 +86,7 @@ toolbar (which contains the :guilabel:`Save` button), you can still save your map by clicking on the :guilabel:`Project` menu and then clicking on :guilabel:`Save`. -|basic| The Map Canvas +:abbr:`★☆☆ (Basic level)` The Map Canvas ............................................................................... This is where the map itself is displayed and where layers are loaded. In the map @@ -94,20 +94,20 @@ canvas you can interact with the visible layers: zoom in/out, move the map, select features and many other operations that we will deeply see in the next sections. -|basic| The Status Bar +:abbr:`★☆☆ (Basic level)` The Status Bar ............................................................................... Shows you information about the current map. Also allows you to adjust the map scale, the map rotation and see the mouse cursor's coordinates on the map. -|basic| The Side Toolbar +:abbr:`★☆☆ (Basic level)` The Side Toolbar ............................................................................... By default the Side toolbar contains the buttons to load the layer and all the buttons to create a new layer. But remember that you can move all the toolbars wherever it is more comfortable for you. -|basic| The Locator Bar +:abbr:`★☆☆ (Basic level)` The Locator Bar ............................................................................... Within this bar you can access to almost all the objects of QGIS: layers, layer @@ -117,7 +117,7 @@ the :ref:`locator_options` section of the QGIS User Manual. .. tip:: With the shortcut :kbd:`Ctrl+K` you can easily access the bar. -|basic| |TY| 1 +:abbr:`★☆☆ (Basic level)` Try Yourself: 1 ------------------------------------------------------------------------------- Try to identify the four elements listed above on your own screen, without @@ -132,7 +132,7 @@ the coming days. remember the names and functions of the screen elements. -|basic| |TY| 2 +:abbr:`★☆☆ (Basic level)` Try Yourself: 2 ------------------------------------------------------------------------------- Try to find each of these tools on your screen. What is their purpose? @@ -160,7 +160,7 @@ Try to find each of these tools on your screen. What is their purpose? #. :guilabel:`Measure line` -|WN| +What's Next? ------------------------------------------------------------------------------- Now that you are familiar with the basics of the QGIS interface, in the next @@ -173,10 +173,6 @@ lesson we will see how to load some common data types. please add it also to the substitutions.txt file in the source folder. -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |checkbox| image:: /static/common/checkbox.png :width: 1.3em .. |favourites| image:: /static/common/mIconFavourites.png diff --git a/docs/training_manual/basic_map/preparation.rst b/docs/training_manual/basic_map/preparation.rst index 3ca086040b9..e8b27c1fba7 100644 --- a/docs/training_manual/basic_map/preparation.rst +++ b/docs/training_manual/basic_map/preparation.rst @@ -1,4 +1,4 @@ -|LS| Adding your first layers +Lesson: Adding your first layers =============================================================================== We will start the application, and create a basic map to use for examples and @@ -23,7 +23,7 @@ Let's get started right away! .. _tm_prepare_a_map: -|basic| |FA| Prepare a map +:abbr:`★☆☆ (Basic level)` Follow Along: Prepare a map ------------------------------------------------------------------------------- #. Open QGIS. You will have a new, blank map. @@ -73,7 +73,7 @@ your work. .. _backlink-interface-preparation-1: -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ------------------------------------------------------------------------------- Repeat the steps above to add the :file:`places.shp` and :file:`rivers.shp` @@ -95,8 +95,8 @@ layers from the same folder (:file:`exercise_data/shapefile`) to the map. .. _load_geopackage: -|basic| |FA| Loading vector data from a GeoPackage Database -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Loading vector data from a GeoPackage Database +---------------------------------------------------------------------------------------- Databases allow you to store a large volume of associated data in one file. You may already be familiar with a database management system (DBMS) such as @@ -141,8 +141,8 @@ Congratulations! You have loaded the first layer from a GeoPackage. .. _backlink-vector-load-from-database-1: -|basic| |FA| Loading vector data from a SpatiaLite Database with the Browser -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Loading vector data from a SpatiaLite Database with the Browser +-------------------------------------------------------------------------------------------------------- QGIS provides access to many other database formats. Like GeoPackage, the SpatiaLite database format is an extension of the SQLite library. And adding @@ -185,7 +185,7 @@ the :guilabel:`Browser`. .. note:: Remember to save your project frequently! The project file doesn't contain any of the data itself, but it remembers which layers you loaded into your map. -|moderate| |TY| Load More Vector Data +:abbr:`★★☆ (Moderate level)` Try Yourself: Load More Vector Data ------------------------------------------------------------------------------- Load the following datasets from the :file:`exercise_data` folder into your map @@ -208,7 +208,7 @@ using any of the methods explained above: * :guilabel:`water` (taken from :file:`exercise_data/shapefile`). -|FA| Reordering the Layers +Follow Along: Reordering the Layers ------------------------------------------------------------------------------- The layers in your Layers list are drawn on the map in a certain order. The @@ -244,14 +244,14 @@ You'll see that the map now makes more sense visually, with roads and buildings appearing above the land use regions. -|IC| +In Conclusion ------------------------------------------------------------------------------- Now you've added all the layers you need from several different sources and created a basic map! -|WN| +What's Next? ------------------------------------------------------------------------------- Now you're familiar with the basic function of the :guilabel:`Open Data Source Manager` @@ -266,12 +266,6 @@ This is the topic of the next lesson. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |dataSourceManager| image:: /static/common/mActionDataSourceManager.png :width: 1.5em .. |dbSchema| image:: /static/common/mIconDbSchema.png @@ -282,7 +276,6 @@ This is the topic of the next lesson. :width: 1.5em .. |geoPackage| image:: /static/common/mGeoPackage.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |newGeoPackageLayer| image:: /static/common/mActionNewGeoPackageLayer.png :width: 1.5em .. |polygonLayer| image:: /static/common/mIconPolygonLayer.png diff --git a/docs/training_manual/basic_map/symbology.rst b/docs/training_manual/basic_map/symbology.rst index cb22d64df34..d25e2162dc6 100644 --- a/docs/training_manual/basic_map/symbology.rst +++ b/docs/training_manual/basic_map/symbology.rst @@ -1,4 +1,4 @@ -|LS| Symbology +Lesson: Symbology =============================================================================== The symbology of a layer is its visual appearance on the map. @@ -19,7 +19,7 @@ information that people will be able to use. **The goal for this lesson:** To be able to create any symbology you want for any vector layer. -|basic| |FA| Changing Colors +:abbr:`★☆☆ (Basic level)` Follow Along: Changing Colors ------------------------------------------------------------------------------- To change a layer's symbology, open its :guilabel:`Layer Properties`. Let's @@ -48,7 +48,7 @@ begin by changing the color of the ``landuse`` layer. #. Click :guilabel:`OK` again in the :guilabel:`Layer Properties` window, and you will see the color change being applied to the layer. -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ------------------------------------------------------------------------------- Change the color of the ``water`` layer to light blue. Try to use the @@ -71,7 +71,7 @@ Change the color of the ``water`` layer to light blue. Try to use the is hidden. -|basic| |FA| Changing Symbol Structure +:abbr:`★☆☆ (Basic level)` Follow Along: Changing Symbol Structure ------------------------------------------------------------------------------- This is good stuff so far, but there's more to a layer's symbology than just @@ -98,7 +98,7 @@ areas so as to make the map less visually cluttered. Now the ``landuse`` layer won't have any lines between areas. -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ------------------------------------------------------------------------------- * Change the ``water`` layer's symbology again so that it has a @@ -131,7 +131,7 @@ individual changes while symbolizing a layer. :align: center -|moderate| |FA| Scale-Based Visibility +:abbr:`★★☆ (Moderate level)` Follow Along: Scale-Based Visibility ------------------------------------------------------------------------------- Sometimes you will find that a layer is not suitable for a given scale. For @@ -168,7 +168,7 @@ Test the effects of this by zooming in and out in your map, noting when the |zoomIn| |zoomOut| -|moderate| |FA| Adding Symbol Layers +:abbr:`★★☆ (Moderate level)` Follow Along: Adding Symbol Layers ------------------------------------------------------------------------------- Now that you know how to change simple symbology for layers, the next step is @@ -226,7 +226,7 @@ your layer that way. It's fun! But it probably has too many colors to use in a real map... -|moderate| |TY| +:abbr:`★★☆ (Moderate level)` Try Yourself: ------------------------------------------------------------------------------- Remembering to zoom in if necessary, create a simple, but not distracting @@ -245,7 +245,7 @@ texture for the ``buildings`` layer using the methods above. :align: center -|moderate| |FA| Ordering Symbol Levels +:abbr:`★★☆ (Moderate level)` Follow Along: Ordering Symbol Levels ------------------------------------------------------------------------------- When symbol layers are rendered, they are also rendered in a sequence, similar @@ -315,7 +315,7 @@ button. Before you change a style, keep in mind that any unsaved style you are replacing will be lost. -|moderate| |TY| +:abbr:`★★☆ (Moderate level)` Try Yourself: ------------------------------------------------------------------------------- Change the appearance of the ``roads`` layer again. @@ -353,7 +353,7 @@ rendering order via the :menuselection:`Advanced --> Symbol levels...` dialog. :align: center -|hard| |TY| +:abbr:`★★★ (Advanced level)` Try Yourself: ------------------------------------------------------------------------------- Symbol levels also work for classified layers (i.e., layers having multiple @@ -385,7 +385,7 @@ rudimentary pre-classified data. #. Open your original map again before continuing with the next exercise. -|moderate| |FA| Symbol layer types +:abbr:`★★☆ (Moderate level)` Follow Along: Symbol layer types ------------------------------------------------------------------------------- In addition to setting fill colors and using predefined patterns, you can use @@ -484,7 +484,7 @@ that make up the texture. .. _backlink-symbology-marker-line: -|moderate| |TY| +:abbr:`★★☆ (Moderate level)` Try Yourself: ------------------------------------------------------------------------------- Apply a green transparent fill color to the ``protected_areas`` layer, @@ -506,7 +506,7 @@ and change the outline to look like this: :align: center -|hard| |FA| Geometry generator symbology +:abbr:`★★★ (Advanced level)` Follow Along: Geometry generator symbology ------------------------------------------------------------------------------- You can use the Geometry generator symbology with all layer types (points, lines @@ -549,7 +549,7 @@ With the Geometry generator symbology you can really go over the edge of *normal symbology. -|hard| |TY| +:abbr:`★★★ (Advanced level)` Try Yourself: ............................................................................... Geometry generator are just another symbol level. Try to add another @@ -574,7 +574,7 @@ The final result should look like this: #. Try experimenting other options to get more useful results. -|hard| |FA| Creating a Custom SVG Fill +:abbr:`★★★ (Advanced level)` Follow Along: Creating a Custom SVG Fill ------------------------------------------------------------------------------- .. note:: To do this exercise, you will need to have the free vector editing @@ -656,20 +656,20 @@ canvas or set in the layer properties a bigger :guilabel:`Texture width`. .. figure:: img/svg_symbol_result.png :align: center -|IC| +In Conclusion ------------------------------------------------------------------------------- Changing the symbology for the different layers has transformed a collection of vector files into a legible map. Not only can you see what's happening, it's even nice to look at! -|FR| +Further Reading ------------------------------------------------------------------------------- `Examples of Beautiful Maps `_ -|WN| +What's Next? ------------------------------------------------------------------------------- Changing symbols for whole layers is useful, but the information contained @@ -688,20 +688,11 @@ map. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |FR| replace:: Further Reading -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |arrowDown| image:: /static/common/mActionArrowDown.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |checkbox| image:: /static/common/checkbox.png :width: 1.3em -.. |hard| image:: /static/common/hard.png .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |rendering| image:: /static/common/rendering.png :width: 1.5em .. |symbology| image:: /static/common/symbology.png diff --git a/docs/training_manual/complete_analysis/analysis_combination.rst b/docs/training_manual/complete_analysis/analysis_combination.rst index d4f4e22881f..ae81a5c24fb 100644 --- a/docs/training_manual/complete_analysis/analysis_combination.rst +++ b/docs/training_manual/complete_analysis/analysis_combination.rst @@ -1,4 +1,4 @@ -|LS| Combining the Analyses +Lesson: Combining the Analyses =============================================================================== Using the vectorized results of the raster analysis will allow you to select @@ -7,7 +7,7 @@ only those buildings on suitable terrain. **The goal for this lesson:** To use the vectorized terrain results to select suitable plots. -|moderate| |TY| +:abbr:`★★☆ (Moderate level)` Try Yourself: ------------------------------------------------------------------------------- #. Save your current map (:file:`raster_analysis.qgs`). @@ -34,7 +34,7 @@ example: :align: center -|moderate| |TY| Inspecting the Results +:abbr:`★★☆ (Moderate level)` Try Yourself: Inspecting the Results ------------------------------------------------------------------------------- Look at each of the buildings in your :guilabel:`new_solution` layer. Compare them @@ -54,7 +54,7 @@ deem to be unsuitable? our dataset. -|moderate| |TY| Refining the Analysis +:abbr:`★★☆ (Moderate level)` Try Yourself: Refining the Analysis ------------------------------------------------------------------------------- You can see from the results that some buildings which were included were @@ -135,27 +135,14 @@ over 100m squared in size. #. Save the selection under :file:`exercise_data/residential_development/` as :file:`final_answer.shp`. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have now answered the original research question, and can offer an opinion (with reasons, backed by analysis) for a recommendation regarding which property to develop. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you will present these results as part of your second assignment. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/complete_analysis/analysis_exercise.rst b/docs/training_manual/complete_analysis/analysis_exercise.rst index f6ea8962ef2..7c507ce8b8a 100644 --- a/docs/training_manual/complete_analysis/analysis_exercise.rst +++ b/docs/training_manual/complete_analysis/analysis_exercise.rst @@ -1,4 +1,4 @@ -|LS| Supplementary Exercise +Lesson: Supplementary Exercise ====================================================================== In this lesson, you will be guided through a complete GIS analysis in @@ -48,7 +48,7 @@ The solution will involve: #. Analyzing a zoning vector layer to find areas that are away from human settlement and are of the correct size -|FA| Setting up the Map +Follow Along: Setting up the Map ---------------------------------------------------------------------- #. Click on the |projectionEnabled| :sup:`Current CRS` button in the @@ -440,7 +440,7 @@ Change the symbology to a more colorful one: #. Select a suitable :guilabel:`Color ramp` #. Click :guilabel:`Run` -|TY| Aspect +Try Yourself: Aspect ---------------------------------------------------------------------- Use the same approach as for calculating the slope, choosing @@ -868,9 +868,6 @@ map. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself .. |addOgrLayer| image:: /static/common/mActionAddOgrLayer.png :width: 1.5em .. |addRasterLayer| image:: /static/common/mActionAddRasterLayer.png diff --git a/docs/training_manual/complete_analysis/index.rst b/docs/training_manual/complete_analysis/index.rst index b8d7a148c35..d84734a9e26 100644 --- a/docs/training_manual/complete_analysis/index.rst +++ b/docs/training_manual/complete_analysis/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Completing the Analysis +Module: Completing the Analysis ******************************************************************************* You now have two halves of an analysis: a vector and a raster part. In this @@ -13,12 +13,3 @@ present the final results. analysis_combination assignment analysis_exercise - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/complete_analysis/raster_to_vector.rst b/docs/training_manual/complete_analysis/raster_to_vector.rst index 86908a581e5..fccf29f3de1 100644 --- a/docs/training_manual/complete_analysis/raster_to_vector.rst +++ b/docs/training_manual/complete_analysis/raster_to_vector.rst @@ -1,4 +1,4 @@ -|LS| Raster to Vector Conversion +Lesson: Raster to Vector Conversion =============================================================================== Converting between raster and vector formats allows you to make use of both @@ -14,8 +14,8 @@ vector. **The goal for this lesson:** To get the raster result into a vector that can be used to complete the analysis. -|moderate| |FA| The :guilabel:`Raster to Vector` Tool -------------------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: The :guilabel:`Raster to Vector` Tool +---------------------------------------------------------------------------------- Start with the map from the last module, :kbd:`raster_analysis.qgs`. There you should have the :kbd:`all_conditions_simple.tif` calculated during the previous @@ -39,7 +39,7 @@ polygons where the value of :guilabel:`suitable` is ``1``. You can change the style of this layer if you want to have a clearer visualization of it. -|moderate| |TY| +:abbr:`★★☆ (Moderate level)` Try Yourself: ------------------------------------------------------------------------------- Refer back to the module on vector analysis. @@ -68,8 +68,8 @@ Refer back to the module on vector analysis. layer in the :guilabel:`Layers` panel and choosing :guilabel:`Save As...`, then continue as per the instructions. -|moderate| |FA| The :guilabel:`Vector to Raster` Tool -------------------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: The :guilabel:`Vector to Raster` Tool +---------------------------------------------------------------------------------- Although unnecessary for our current problem, it's useful to know about the opposite conversion from the one performed above. Convert to raster the @@ -99,29 +99,15 @@ opposite conversion from the one performed above. Convert to raster the * When it is complete, gauge its success by comparing the new raster with the original one. They should match up exactly, pixel for pixel. -|IC| +In Conclusion ------------------------------------------------------------------------------- Converting between raster and vector formats allows you to widen the applicability of data, and need not lead to data degradation. -|WN| +What's Next? ------------------------------------------------------------------------------- Now that we have the results of the terrain analysis available in vector format, they can be used to solve the problem of which buildings we should consider for the residential development. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/create_vector_data/actions.rst b/docs/training_manual/create_vector_data/actions.rst index 164bcdd5fa6..974dd861042 100644 --- a/docs/training_manual/create_vector_data/actions.rst +++ b/docs/training_manual/create_vector_data/actions.rst @@ -1,4 +1,4 @@ -|LS| Actions +Lesson: Actions ====================================================================== Now that you have seen a default action in the previous lesson, it is @@ -19,7 +19,7 @@ What we are going to do is to associate each property with its image. Then we will create an action that will open the image for a property when clicking on the property. -|basic| |FA| Add a Field for Images +:abbr:`★☆☆ (Basic level)` Follow Along: Add a Field for Images ---------------------------------------------------------------------- The ``school_property`` layer has no way to associate an image with a @@ -70,7 +70,7 @@ property yet. First we will create a field for this purpose. #. Save your edits and exit edit mode. -|basic| |FA| Creating an Action +:abbr:`★☆☆ (Basic level)` Follow Along: Creating an Action ---------------------------------------------------------------------- #. Open the :guilabel:`Actions` tab for the @@ -146,7 +146,7 @@ Now it is time to test the new action: The image for that property should open. -|moderate| |FA| Searching the Internet +:abbr:`★★☆ (Moderate level)` Follow Along: Searching the Internet ---------------------------------------------------------------------- Let's say we are looking at the map and want to know more about the area that a @@ -257,8 +257,8 @@ Now to test the new action. .. note:: If your action doesn't work, check that everything was entered correctly; typos are common with this kind of work! -|hard| |FA| Open a Webpage Directly in QGIS ----------------------------------------------------------------------- +:abbr:`★★★ (Advanced level)` Follow Along: Open a Webpage Directly in QGIS +----------------------------------------------------------------------------- Above, you've seen how to open a webpage in an external browser. There are some shortcomings with this approach in that it adds an unknowable dependency – will @@ -319,7 +319,7 @@ To create the layer action: #. Try to use the methods described above to load a Wikipedia page using the Wikipedia action you just created. -|IC| +In Conclusion ---------------------------------------------------------------------- Actions allow you to give your map extra functionality, useful to the @@ -328,7 +328,7 @@ Due to the fact that you can use shell commands for any operating system, as well as Python, the sky is the limit in terms of the functions you could incorporate! -|WN| +What's Next? ---------------------------------------------------------------------- Now that you've done all kinds of vector data creation, you will @@ -342,15 +342,8 @@ That is the topic of the next module. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? .. |actionRun| image:: /static/common/mAction.png :width: 1.5em -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png .. |symbologyAdd| image:: /static/common/symbologyAdd.png :width: 1.5em .. |symbologyRemove| image:: /static/common/symbologyRemove.png diff --git a/docs/training_manual/create_vector_data/create_new_vector.rst b/docs/training_manual/create_vector_data/create_new_vector.rst index 04aeac93315..4aa0dc254c4 100644 --- a/docs/training_manual/create_vector_data/create_new_vector.rst +++ b/docs/training_manual/create_vector_data/create_new_vector.rst @@ -1,4 +1,4 @@ -|LS| Creating a New Vector Dataset +Lesson: Creating a New Vector Dataset =============================================================================== The data that you use has to come from somewhere. For most common applications, @@ -8,7 +8,7 @@ you'll need to create your own new data. **The goal for this lesson:** To create a new vector dataset. -|basic| |FA| The Layer Creation Dialog +:abbr:`★☆☆ (Basic level)` Follow Along: The Layer Creation Dialog ------------------------------------------------------------------------------- Before you can add new vector data, you need a vector dataset to add it to. In @@ -80,7 +80,7 @@ The new layer should appear in your :guilabel:`Layers` panel. .. _tm_datasources: -|basic| |FA| Data Sources +:abbr:`★☆☆ (Basic level)` Follow Along: Data Sources ------------------------------------------------------------------------------- When you create new data, it obviously has to be about objects that really @@ -234,7 +234,7 @@ digitizing until you're done creating the feature as above. Then: to get out of edit mode. -|basic| |TY| Digitizing Polygons +:abbr:`★☆☆ (Basic level)` Try Yourself: Digitizing Polygons ------------------------------------------------------------------------------- Digitize the school itself and the upper field. Use this image to assist you: @@ -252,7 +252,7 @@ Remember that each new feature needs to have a unique ``id`` value! lessons. -|moderate| |FA| Using Vertex Editor Table +:abbr:`★★☆ (Moderate level)` Follow Along: Using Vertex Editor Table ------------------------------------------------------------------------------- Another way to edit a feature is to manually enter the actual @@ -302,7 +302,7 @@ table. #. When done editing, click the |toggleEditing| :sup:`Toggle Editing` button to get out of edit mode, and save your edits. -|basic| |TY| Digitizing Lines +:abbr:`★☆☆ (Basic level)` Try Yourself: Digitizing Lines ------------------------------------------------------------------------------- We are going to digitize two routes which are not already marked on the roads layer; one is a path, the other is a track. @@ -347,7 +347,7 @@ Our track is a little further to the south: :align: center -|IC| +In Conclusion ------------------------------------------------------------------------------- Now you know how to create features! This course doesn't cover adding point @@ -359,7 +359,7 @@ usual, and then the feature is created. Knowing how to digitize is important because it's a very common activity in GIS programs. -|WN| +What's Next? ------------------------------------------------------------------------------- Features in a GIS layer aren't just pictures, but objects in space. For @@ -374,19 +374,12 @@ be useful. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |captureLine| image:: /static/common/mActionCaptureLine.png :width: 1.5em .. |capturePolygon| image:: /static/common/mActionCapturePolygon.png :width: 1.5em .. |dataSourceManager| image:: /static/common/mActionDataSourceManager.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |raster| image:: /static/common/mIconRaster.png :width: 1.5em .. |saveEdits| image:: /static/common/mActionSaveEdits.png diff --git a/docs/training_manual/create_vector_data/forms.rst b/docs/training_manual/create_vector_data/forms.rst index d50a08ea870..9699a0c4895 100644 --- a/docs/training_manual/create_vector_data/forms.rst +++ b/docs/training_manual/create_vector_data/forms.rst @@ -1,4 +1,4 @@ -|LS| Forms +Lesson: Forms ====================================================================== When you add new data via digitizing, you're presented with a dialog @@ -14,8 +14,8 @@ This lesson shows you how. **The goal for this lesson:** To create a form for a layer. -|basic| |FA| Using QGIS' Form Design Functionality ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Using QGIS' Form Design Functionality +------------------------------------------------------------------------------ #. Select the ``roads`` layer in the :guilabel:`Layers` panel #. Enter *Edit Mode* as before @@ -47,7 +47,7 @@ map, rather than needing to search for a specific street in the its form pops up as long as the :guilabel:`Auto open form` is checked. -|basic| |TY| Using the Form to Edit Values +:abbr:`★☆☆ (Basic level)` Try Yourself: Using the Form to Edit Values ---------------------------------------------------------------------- If you are in edit mode, you can use this form to edit a feature's @@ -66,7 +66,7 @@ attributes. been updated in the attributes table and therefore in the source data -|moderate| |FA| Setting Form Field Types +:abbr:`★★☆ (Moderate level)` Follow Along: Setting Form Field Types ---------------------------------------------------------------------- It's nice to edit things using a form, but you still have to enter @@ -101,7 +101,7 @@ checkbox next to it denoting ``True`` (checked) or ``False`` (unchecked). -|hard| |TY| +:abbr:`★★★ (Advanced level)` Try Yourself: ---------------------------------------------------------------------- Set a more appropriate form widget for the :guilabel:`highway` field. @@ -129,7 +129,7 @@ Set a more appropriate form widget for the :guilabel:`highway` field. .. figure:: img/highway_as_value_map.png :align: center -|hard| |TY| Creating Test Data +:abbr:`★★★ (Advanced level)` Try Yourself: Creating Test Data ---------------------------------------------------------------------- You can also design your own custom form completely from scratch. @@ -156,7 +156,7 @@ You can also design your own custom form completely from scratch. .. _creating-new-form: -|hard| |FA| Creating a New Form +:abbr:`★★★ (Advanced level)` Follow Along: Creating a New Form ---------------------------------------------------------------------- Now we want to create our own custom form for the attribute data @@ -206,8 +206,8 @@ the person who creates the forms). #. Save your new form as :file:`exercise_data/forms/add_people.ui` #. When it's done saving, you can close *Qt Designer* -|hard| |FA| Associating the Form with Your Layer ----------------------------------------------------------------------- +:abbr:`★★★ (Advanced level)` Follow Along: Associating the Form with Your Layer +--------------------------------------------------------------------------------- #. Go back to QGIS #. Double click the :guilabel:`test-data` layer in the legend to @@ -234,7 +234,7 @@ the person who creates the forms). :menuselection:`Edit Feature Form` instead, and you can then adjust the attributes in the new form even after initial capture. -|IC| +In Conclusion ---------------------------------------------------------------------- Using forms, you can make life easier for yourself when editing or @@ -244,7 +244,7 @@ you can control the experience of someone who digitizes new data for that layer, thereby minimizing misunderstandings and unnecessary errors. -|FR| +Further Reading ---------------------------------------------------------------------- If you completed the advanced section above and have knowledge of @@ -253,7 +253,7 @@ Python, you may want to check out about creating custom feature forms with Python logic, which allows advanced functions including data validation, autocompletion, etc. -|WN| +What's Next? ---------------------------------------------------------------------- Opening a form on identifying a feature is one of the standard actions @@ -269,17 +269,8 @@ This is the subject of the next lesson. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |FR| replace:: Further Reading -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png .. |identify| image:: /static/common/mActionIdentify.png :width: 1.5em .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |options| image:: /static/common/mActionOptions.png :width: 1em diff --git a/docs/training_manual/create_vector_data/index.rst b/docs/training_manual/create_vector_data/index.rst index 2f77dd9c77d..7b31260e376 100644 --- a/docs/training_manual/create_vector_data/index.rst +++ b/docs/training_manual/create_vector_data/index.rst @@ -1,7 +1,7 @@ .. _tm_create_vector_data: ******************************************************************************* -|MOD| Creating Vector Data +Module: Creating Vector Data ******************************************************************************* Creating maps using existing data is just the beginning. In this module, you'll @@ -14,12 +14,3 @@ learn how to modify existing vector data and create new datasets entirely. topo_editing forms actions - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/create_vector_data/topo_editing.rst b/docs/training_manual/create_vector_data/topo_editing.rst index c25c9a203a2..38d327a2f6e 100644 --- a/docs/training_manual/create_vector_data/topo_editing.rst +++ b/docs/training_manual/create_vector_data/topo_editing.rst @@ -1,4 +1,4 @@ -|LS| Feature Topology +Lesson: Feature Topology ====================================================================== Topology is a useful aspect of vector data layers, because it minimizes errors @@ -11,7 +11,7 @@ shared border and both features will change at the same time. **The goal for this lesson:** To understand topology using examples. -|moderate| |FA| Snapping +:abbr:`★★☆ (Moderate level)` Follow Along: Snapping ---------------------------------------------------------------------- Snapping makes topological editing easier. @@ -57,8 +57,8 @@ To set snapping options: :guilabel:`Advanced Digitizing` toolbar. -|moderate| |FA| Correct Topological Features ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Correct Topological Features +------------------------------------------------------------------------ Topology features can sometimes need to be updated. In our study area, an area has been turned into forest, so the @@ -104,7 +104,7 @@ going to use the *Vertex Tool* to edit and join existing polygons. Don't worry if you have joined more, less or different areas of forest. -|moderate| |FA| Tool: Simplify Feature +:abbr:`★★☆ (Moderate level)` Follow Along: Tool: Simplify Feature ---------------------------------------------------------------------- Continuing on the same layer, we will test the |simplify| @@ -138,7 +138,7 @@ Before you go on, set the polygon back to its original state by undoing the last change. -|moderate| |TY| Tool: Add Ring +:abbr:`★★☆ (Moderate level)` Try Yourself: Tool: Add Ring ---------------------------------------------------------------------- The |addRing| :sup:`Add Ring` tool allows you to add an interior ring @@ -176,7 +176,7 @@ So you are advised to turn off snapping before cutting a hole. * Undo your edit before continuing with the exercise for the next tool. -|moderate| |TY| Tool: Add Part +:abbr:`★★☆ (Moderate level)` Try Yourself: Tool: Add Part ---------------------------------------------------------------------- The |addPart| :sup:`Add Part` tool allows you to add a new part to a @@ -210,7 +210,7 @@ would use this tool to create them. #. Undo your edit before continuing with the exercise for the next tool. -|moderate| |FA| Tool: Reshape Features +:abbr:`★★☆ (Moderate level)` Follow Along: Tool: Reshape Features ---------------------------------------------------------------------- The |reshape| :sup:`Reshape Features` tool is used to extend a polygon @@ -251,7 +251,7 @@ Cut away a part: :align: center -|moderate| |TY| Tool: Split Features +:abbr:`★★☆ (Moderate level)` Try Yourself: Tool: Split Features ---------------------------------------------------------------------- The |splitFeatures| :sup:`Split Features` tool is similar to the @@ -287,7 +287,7 @@ We will use the tool to split a corner from a polygon. .. _backlink-create-vector-topology-4: -|hard| |TY| Tool: Merge Features +:abbr:`★★★ (Advanced level)` Try Yourself: Tool: Merge Features ---------------------------------------------------------------------- Now we will re-join the feature you just split out to the remaining @@ -318,7 +318,7 @@ part of the polygon: Using the :guilabel:`Merge Attributes of Selected Features` tool will keep the geometries distinct, but give them the same attributes. -|IC| +In Conclusion ---------------------------------------------------------------------- Topology editing is a powerful tool that allows you to create and modify @@ -326,7 +326,7 @@ objects quickly and easily, while ensuring that they remain topologically correct. -|WN| +What's Next? ---------------------------------------------------------------------- Now you know how to digitize the shape of the objects easily, but @@ -341,11 +341,6 @@ simpler and more effective. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |addPart| image:: /static/common/mActionAddPart.png :width: 1.5em .. |addRing| image:: /static/common/mActionAddRing.png @@ -356,13 +351,11 @@ simpler and more effective. :width: 2em .. |deleteRing| image:: /static/common/mActionDeleteRing.png :width: 2em -.. |hard| image:: /static/common/hard.png .. |largeLandUseArea| replace:: Bontebok National Park .. |mergeFeatureAttributes| image:: /static/common/mActionMergeFeatureAttributes.png :width: 1.5em .. |mergeFeatures| image:: /static/common/mActionMergeFeatures.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |redo| image:: /static/common/mActionRedo.png :width: 1.5em .. |reshape| image:: /static/common/mActionReshape.png diff --git a/docs/training_manual/database_concepts/adding_data.rst b/docs/training_manual/database_concepts/adding_data.rst index ff9611103af..abc98715c5a 100644 --- a/docs/training_manual/database_concepts/adding_data.rst +++ b/docs/training_manual/database_concepts/adding_data.rst @@ -1,4 +1,4 @@ -|LS| Adding Data to the Model +Lesson: Adding Data to the Model =============================================================================== The models we've created will now need to be populated with the data they're @@ -48,7 +48,7 @@ Result: (1 row) -|TY| |basic| +Try Yourself: :abbr:`★☆☆ (Basic level)` ............................................................................... Use the :kbd:`INSERT` command to add a new street to the :kbd:`streets` table. @@ -65,7 +65,7 @@ Use the :kbd:`INSERT` command to add a new street to the :kbd:`streets` table. Sequencing Data Addition According to Constraints ------------------------------------------------------------------------------- -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ------------------------------------------------------------------------------- Try to add a person object to the :kbd:`people` table with the following details:: @@ -178,7 +178,7 @@ Let's look at our people table now: ----+------+----------+-----------+---------- (0 rows) -|TY| |hard| +Try Yourself: :abbr:`★★★ (Advanced level)` ------------------------------------------------------------------------------- Use the skills you have learned to add some new friends to your database: @@ -193,30 +193,15 @@ Use the skills you have learned to add some new friends to your database: Sally Norman | 83 | 1 | 072 932 31 32 -|IC| +In Conclusion ------------------------------------------------------------------------------- Now you know how to add new data to the existing models you created previously. Remember that if you want to add new kinds of data, you may want to modify and/or create new models to contain that data. -|WN| +What's Next? ------------------------------------------------------------------------------- Now that you've added some data, you'll learn how to use queries to access this data in various ways. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/database_concepts/data_model.rst b/docs/training_manual/database_concepts/data_model.rst index 93e38ae5b1a..f48b73641d4 100644 --- a/docs/training_manual/database_concepts/data_model.rst +++ b/docs/training_manual/database_concepts/data_model.rst @@ -1,4 +1,4 @@ -|LS| Implementing the Data Model +Lesson: Implementing the Data Model =============================================================================== Now that we've covered all the theory, let's create a new database. This @@ -244,7 +244,7 @@ Which should show something like this: As you can see, our table is currently empty. -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ............................................................................... Use the approach shown above to make a table called people: @@ -423,26 +423,13 @@ Under Ubuntu, you can install it like this: pgAdmin III will be covered in more detail in another module. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have now seen how to create a brand new database, starting completely from scratch. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you'll learn how to use the DBMS to add new data. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/database_concepts/db_intro.rst b/docs/training_manual/database_concepts/db_intro.rst index 42bd290ae51..f93c9a64481 100644 --- a/docs/training_manual/database_concepts/db_intro.rst +++ b/docs/training_manual/database_concepts/db_intro.rst @@ -1,4 +1,4 @@ -|LS| Introduction to Databases +Lesson: Introduction to Databases =============================================================================== Before using PostgreSQL, let's make sure of our ground by covering general @@ -118,7 +118,7 @@ Modelling an Address Database Let's use a simple case study to see how a database is constructed. We want to create an address database. -|TY| |basic| +Try Yourself: :abbr:`★☆☆ (Basic level)` ............................................................................... Write down the properties which make up a simple address and which we would want @@ -205,7 +205,7 @@ Imagine you have many friends with the same street name or city. Every time this data is duplicated, it consumes space. Worse still, if a city name changes, you have to do a lot of work to update your database. -|TY| |basic| +Try Yourself: :abbr:`★☆☆ (Basic level)` ------------------------------------------------------------------------------- Redesign the theoretical `people` table above to reduce duplication and to normalise the data structure. @@ -336,7 +336,7 @@ this: The ER Diagram helps us to express 'one to many' relationships. In this case the arrow symbol show that one street can have many people living on it. -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ............................................................................... Our `people` model still has some normalisation issues - try to see if you can @@ -431,28 +431,14 @@ this: If something goes wrong during the process (e.g. power failure), the transaction will be rolled back. -|IC| +In Conclusion ------------------------------------------------------------------------------- Databases allow you to manage data in a structured way using simple code structures. -|WN| +What's Next? ------------------------------------------------------------------------------- Now that we've looked at how databases work in theory, let's create a new database to implement the theory we've covered. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/database_concepts/index.rst b/docs/training_manual/database_concepts/index.rst index 82b42579231..406d400ec7c 100644 --- a/docs/training_manual/database_concepts/index.rst +++ b/docs/training_manual/database_concepts/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Database Concepts with PostgreSQL +Module: Database Concepts with PostgreSQL ******************************************************************************* Relational Databases are an important part of any GIS system. In this module, @@ -16,12 +16,3 @@ learning about other typical RDBMS functions. queries views rules - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/database_concepts/queries.rst b/docs/training_manual/database_concepts/queries.rst index 41d9b22d79f..a41f4df39d5 100644 --- a/docs/training_manual/database_concepts/queries.rst +++ b/docs/training_manual/database_concepts/queries.rst @@ -1,4 +1,4 @@ -|LS| Queries +Lesson: Queries =============================================================================== When you write a :kbd:`SELECT ...` command it is commonly known as a query - @@ -270,7 +270,7 @@ Result: .. note:: Because we have not used an :kbd:`ORDER BY` clause, the order of your results may not match what is shown here. -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ............................................................................... Summarise the people by street name and show the actual street names instead @@ -300,26 +300,13 @@ of the street_ids. is ambiguous (i.e. not unique across all tables in the database). -|IC| +In Conclusion ------------------------------------------------------------------------------- You've seen how to use queries to return the data in your database in a way that allows you to extract useful information from it. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you'll see how to create views from the queries that you've written. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/database_concepts/rules.rst b/docs/training_manual/database_concepts/rules.rst index 9a82928509b..db3c3c00c70 100644 --- a/docs/training_manual/database_concepts/rules.rst +++ b/docs/training_manual/database_concepts/rules.rst @@ -1,4 +1,4 @@ -|LS| Rules +Lesson: Rules =============================================================================== Rules allow the "query tree" of an incoming query to be rewritten. One common @@ -58,25 +58,14 @@ this: .. note:: The value of the :kbd:`time` field will depend on the current date and time. -|IC| +In Conclusion ------------------------------------------------------------------------------- Rules allow you to automatically add or change data in your database to reflect changes in other parts of the database. -|WN| +What's Next? ------------------------------------------------------------------------------- The next module will introduce you to Spatial Database using PostGIS, which takes these database concepts and applies them to GIS data. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? diff --git a/docs/training_manual/database_concepts/views.rst b/docs/training_manual/database_concepts/views.rst index 1a933556176..cfed4fd8df1 100644 --- a/docs/training_manual/database_concepts/views.rst +++ b/docs/training_manual/database_concepts/views.rst @@ -1,4 +1,4 @@ -|LS| Views +Lesson: Views =============================================================================== When you write a query, you need to spend a lot of time and effort formulating @@ -78,24 +78,13 @@ If you no longer need a view, you can delete it like this: drop view roads_count_v; -|IC| +In Conclusion ------------------------------------------------------------------------------- Using views, you can save a query and access its results as if it were a table. -|WN| +What's Next? ------------------------------------------------------------------------------- Sometimes, when changing data, you want your changes to have effects elsewhere in the database. The next lesson will show you how to do this. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? diff --git a/docs/training_manual/databases/db_browser.rst b/docs/training_manual/databases/db_browser.rst index 0708f953085..e459574392b 100644 --- a/docs/training_manual/databases/db_browser.rst +++ b/docs/training_manual/databases/db_browser.rst @@ -1,4 +1,4 @@ -|LS| Working with Databases in the QGIS Browser +Lesson: Working with Databases in the QGIS Browser =============================================================================== In the previous 2 modules we looked at the basic concepts, features and @@ -9,8 +9,8 @@ section will dive deeper into how to effectively use spatial databases in QGIS. **The goal for this lesson:** To learn how to interact with spatial databases using the QGIS Browser interface. -|basic| |FA| Adding Database Tables to QGIS using the Browser -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Adding Database Tables to QGIS using the Browser +----------------------------------------------------------------------------------------- We have already briefly looked at how to add tables from a database as QGIS layers, now lets look at this in a bit more detail and look at the different @@ -43,8 +43,8 @@ interface. parameters for a new connection. -|basic| |FA| Adding a filtered set of records as a Layer -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Adding a filtered set of records as a Layer +------------------------------------------------------------------------------------ Now that we have seen how to add an entire table as a QGIS layer it might be nice to learn how to add a filtered set of records from a table as a layer @@ -75,27 +75,14 @@ by using queries that we learned about in previous sections. You will notice that only the Primary Roads have been added to your map rather than the entire layer. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have seen how to interact with spatial databases using the QGIS Browser and how to add layers to your map based on a query filter. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you'll see how to work with the DB Manager interface in QGIS for a more complete set of database management tasks. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png diff --git a/docs/training_manual/databases/db_manager.rst b/docs/training_manual/databases/db_manager.rst index 620b30e824a..f840d62dddc 100644 --- a/docs/training_manual/databases/db_manager.rst +++ b/docs/training_manual/databases/db_manager.rst @@ -1,4 +1,4 @@ -|LS| Using DB Manager to work with Spatial Databases in QGIS +Lesson: Using DB Manager to work with Spatial Databases in QGIS =============================================================================== We have already seen how to perform many database operations with @@ -6,11 +6,12 @@ QGIS as well as with other tools, but now it's time to look at the DB Manager tool which provides much of this same functionality as well as more management oriented tools. + **The goal for this lesson:** To learn how to interact with spatial databases using the QGIS DB Manager. -|basic| |FA| Managing PostGIS Databases with DB Manager -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Managing PostGIS Databases with DB Manager +------------------------------------------------------------------------------------ You should first open the DB Manager interface by selecting :guilabel:`Database --> DB Manager --> DB Manager` on the menu or by @@ -102,7 +103,7 @@ spatial and normal indexes. .. figure:: img/indexes_panel.png :align: center -|basic| |FA| Creating a New Table +:abbr:`★☆☆ (Basic level)` Follow Along: Creating a New Table ------------------------------------------------------------------------------- Now that we have gone through the process of working with existing @@ -134,7 +135,7 @@ course find that there is no data in it. From here you can :guilabel:`Toggle Editing` on the layer menu and begin to add places to your table. -|basic| |FA| Basic Database Administration +:abbr:`★☆☆ (Basic level)` Follow Along: Basic Database Administration ------------------------------------------------------------------------------- The DB Manager will also let you do some basic database @@ -163,7 +164,7 @@ You can find more information about the VACUUM ANALYZE process in the `PostgreSQL Documentation on VACUUM ANALYZE `_. -|basic| |FA| Executing SQL Queries with DB Manager +:abbr:`★☆☆ (Basic level)` Follow Along: Executing SQL Queries with DB Manager ------------------------------------------------------------------------------- DB Manager also provides a way for you to write queries against your @@ -273,14 +274,14 @@ You can now inspect the shapefile you created with the Browser panel. .. figure:: img/inspect_vector_output.png :align: center -|IC| +In Conclusion ------------------------------------------------------------------------------- You have now seen how to use the DB Manager interface in QGIS to manage your spatial databases, to execute SQL queries against your data and how to import and export data. -|WN| +What's Next? ------------------------------------------------------------------------------- Next, we will look at how to use many of these same techniques with @@ -293,10 +294,5 @@ Next, we will look at how to use many of these same techniques with please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |dbManager| image:: /static/common/dbmanager.png :width: 1.5em diff --git a/docs/training_manual/databases/index.rst b/docs/training_manual/databases/index.rst index c3843264c17..e6e45934671 100644 --- a/docs/training_manual/databases/index.rst +++ b/docs/training_manual/databases/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Using Spatial Databases in QGIS +Module: Using Spatial Databases in QGIS ******************************************************************************* In this module you will learn about how to use Spatial Databases with QGIS to @@ -14,12 +14,3 @@ spatial database implementations including SpatiaLite. db_browser db_manager spatialite - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/databases/spatialite.rst b/docs/training_manual/databases/spatialite.rst index 2d58d9379fa..8c771fd998c 100644 --- a/docs/training_manual/databases/spatialite.rst +++ b/docs/training_manual/databases/spatialite.rst @@ -1,4 +1,4 @@ -|LS| Working with SpatiaLite databases in QGIS +Lesson: Working with SpatiaLite databases in QGIS ====================================================================== While PostGIS is generally used on a server to provide spatial database capabilities to multiple users at the same time, QGIS also @@ -14,8 +14,8 @@ provided to work with these databases in QGIS. **The goal for this lesson:** To learn how to interact with SpatiaLite databases using the QGIS Browser interface. -|basic| |FA| Creating a SpatiaLite database with the Browser ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Creating a SpatiaLite database with the Browser +------------------------------------------------------------------------------------------- Using the Browser panel, we can create a new SpatiaLite database and get it setup for use in QGIS. @@ -65,7 +65,7 @@ We also learned about how to import data into a database using the DB Manager and you can use this same technique to import data into your new SpatiaLite DB. -|IC| +In Conclusion ---------------------------------------------------------------------- You have seen how to create SpatiaLite databases, add tables to @@ -78,9 +78,5 @@ them and use these tables as layers in QGIS. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |basic| image:: /static/common/basic.png .. |newSpatiaLiteLayer| image:: /static/common/mActionNewSpatiaLiteLayer.png :width: 1.5em diff --git a/docs/training_manual/forestry/basic_lidar.rst b/docs/training_manual/forestry/basic_lidar.rst index 37a60301ddc..bddea78ba2d 100644 --- a/docs/training_manual/forestry/basic_lidar.rst +++ b/docs/training_manual/forestry/basic_lidar.rst @@ -1,4 +1,4 @@ -|LS| DEM from LiDAR Data +Lesson: DEM from LiDAR Data =============================================================================== You can improve the look of your maps by using different background images. @@ -12,7 +12,7 @@ hillshade raster to use in your map presentation later. data and a hillshade raster. -|basic| |FA| Installing Lastools +:abbr:`★☆☆ (Basic level)` Follow Along: Installing Lastools ------------------------------------------------------------------------------- Managing LiDAR data within QGIS is possible using the Processing framework and @@ -68,7 +68,7 @@ To setup the LAStools in QGIS: .. figure:: img/processing_options.png :align: center -|basic| |FA| Calculating a DEM with LAStools +:abbr:`★☆☆ (Basic level)` Follow Along: Calculating a DEM with LAStools ------------------------------------------------------------------------------- You have already used the :menuselection:`Processing` toolbox in :doc:`../vector_analysis/spatial_statistics` @@ -147,7 +147,7 @@ The result DEM is added to your map with the generic name :kbd:`Output raster fi You can use the unlicensed tool as indicated in the license file, but you get the diagonals you can appreciate in the image results. -|basic| |FA| Creating a Terrain Hillshade +:abbr:`★☆☆ (Basic level)` Follow Along: Creating a Terrain Hillshade ------------------------------------------------------------------------------- For visualization purposes, a hillshade generated from a DEM gives a better @@ -171,7 +171,7 @@ soil drains that have been dug in the forests. :align: center -|IC| +In Conclusion ------------------------------------------------------------------------------- Using LiDAR data to get a DEM, specially in forested areas, gives good results @@ -180,21 +180,8 @@ sources like the `SRTM 9m resolution DEMs Either way, you can use them to create a hillshade raster to use in your map presentations. -|WN| +What's Next? ------------------------------------------------------------------------------- In the next, and final step in this module, lesson you will use the hillshade raster and the forest inventory results to create a map presentation of the results. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png diff --git a/docs/training_manual/forestry/forest_maps.rst b/docs/training_manual/forestry/forest_maps.rst index e6743826e74..aa723a298df 100644 --- a/docs/training_manual/forestry/forest_maps.rst +++ b/docs/training_manual/forestry/forest_maps.rst @@ -1,4 +1,4 @@ -|LS| Creating Detailed Maps with the Atlas Tool +Lesson: Creating Detailed Maps with the Atlas Tool =============================================================================== The systematic sampling design is ready and the field teams have loaded the GPS @@ -12,7 +12,7 @@ tool to automatically generate a number of maps with a common format. **The goal for this lesson:** Learn to use the Atlas tool in QGIS to generate detailed printable maps to assist in the field inventory work. -|basic| |FA| Preparing the Print Layout +:abbr:`★☆☆ (Basic level)` Follow Along: Preparing the Print Layout ------------------------------------------------------------------------------- Before we can automate the detailed maps of the forest area and our sampling @@ -82,7 +82,7 @@ grid at some point, you can always check or uncheck it in the :menuselection:`View` menu. -|basic| |FA| Adding Background Map +:abbr:`★☆☆ (Basic level)` Follow Along: Adding Background Map ------------------------------------------------------------------------------- Leave the layout open but go back to the map. Let's add some background data and @@ -122,7 +122,7 @@ Obviously this is not good enough; you want to make the plot numbers as clearly visible as possible for the field teams. -|basic| |TY| Changing the Symbology of the Layers +:abbr:`★☆☆ (Basic level)` Try Yourself: Changing the Symbology of the Layers ------------------------------------------------------------------------------- You have been working in :doc:`../basic_map/index` with symbology and in @@ -159,7 +159,7 @@ In order to keep it, and have a visualization of it that shows only the stand bo .. figure:: img/composer_2-3.png :align: center -|basic| |TY| Create a Basic Map Template +:abbr:`★☆☆ (Basic level)` Try Yourself: Create a Basic Map Template ------------------------------------------------------------------------------- #. Once you have a symbology you are happy with, you are ready to add some more @@ -183,8 +183,8 @@ In order to keep it, and have a visualization of it that shows only the stand bo That is what it will look like when printed. -|basic| |FA| Adding More Elements to the Print Layout -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Adding More Elements to the Print Layout +--------------------------------------------------------------------------------- As you probably noticed in the suggested map template images, there are plenty of room on the right side of the canvas. Lets see what else could go in there. @@ -263,7 +263,7 @@ The basic map layout is ready, now you want to make use of the Atlas tool to generate as many detail maps in this format as you consider necessary. -|basic| |FA| Creating an Atlas Coverage +:abbr:`★☆☆ (Basic level)` Follow Along: Creating an Atlas Coverage ------------------------------------------------------------------------------- The Atlas coverage is just a vector layer that will be used to generate the @@ -295,7 +295,7 @@ of what each map (created from each polygon) will contain. .. figure:: img/atlas_coverage.png :align: center -|basic| |FA| Setting Up the Atlas Tool +:abbr:`★☆☆ (Basic level)` Follow Along: Setting Up the Atlas Tool ------------------------------------------------------------------------------- The last step is to set up the Atlas tool: @@ -340,7 +340,7 @@ Now you can use the preview tool for Atlas maps to review what your maps will lo Note that some of them cover areas that are not interesting. Let's do something about it and save some trees by not printing those useless maps. -|basic| |FA| Editing the Coverage Layer +:abbr:`★☆☆ (Basic level)` Follow Along: Editing the Coverage Layer ------------------------------------------------------------------------------- Besides removing the polygons for those areas that are not interesting, you can @@ -418,7 +418,7 @@ labels to use the information from the :guilabel:`atlas_coverage` layer's attrib #. Use the Atlas preview to browse through all the maps you will be creating soon and enjoy! -|basic| |FA| Printing the Maps +:abbr:`★☆☆ (Basic level)` Follow Along: Printing the Maps ------------------------------------------------------------------------------- Last but not least, printing or exporting your maps to image files or PDF files. @@ -455,7 +455,7 @@ Lets print the maps as a single PDF that you can send to the field office for pr #. Close the :guilabel:`Print Layout` and the project. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have managed to create a template map that can be used to automatically @@ -464,7 +464,7 @@ plots. As you noticed, this was not an easy task but the benefit will come when you need to create similar maps for other regions and you can use the template you just saved. -|WN| +What's Next? ------------------------------------------------------------------------------- In the next lesson, you will see how you can use LiDAR data to create a DEM and @@ -477,16 +477,10 @@ then use it to enhance your data and maps visibility. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |addMap| image:: /static/common/mActionAddMap.png :width: 1.5em .. |atlas| image:: /static/common/mIconAtlas.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |calculateField| image:: /static/common/mActionCalculateField.png :width: 1.5em .. |fileSave| image:: /static/common/mActionFileSave.png diff --git a/docs/training_manual/forestry/forestry_intro.rst b/docs/training_manual/forestry/forestry_intro.rst index a7918687ff1..4ccc5126164 100644 --- a/docs/training_manual/forestry/forestry_intro.rst +++ b/docs/training_manual/forestry/forestry_intro.rst @@ -1,4 +1,4 @@ -|LS| Forestry Module Presentation +Lesson: Forestry Module Presentation =============================================================================== Following this module about a forestry application requires the knowledge you @@ -35,12 +35,3 @@ accessed in English `here `_. -|basic| |FA| Implementing a Systematic Sampling Plot Design -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Implementing a Systematic Sampling Plot Design +--------------------------------------------------------------------------------------- For the forest you are working with, the manager has decided that a systematic sampling design is the most appropriate for this forest and has decided that a @@ -142,7 +142,7 @@ new ``Plot_id`` field. .. figure:: img/labelled_plots.png :align: center -|basic| |FA| Exporting Sample Plots as GPX format +:abbr:`★☆☆ (Basic level)` Follow Along: Exporting Sample Plots as GPX format ------------------------------------------------------------------------------- The field teams will be probably using a GPS device to locate the sample plots @@ -184,7 +184,7 @@ information about it in the section :ref:`working_gps` in the **QGIS User Manual Save your QGIS project now. -|IC| +In Conclusion ------------------------------------------------------------------------------- You just saw how easily you can create a systematic sampling design to be used @@ -192,7 +192,7 @@ in a forest inventory. Creating other types of sampling designs will involve the use of different tools within QGIS, spreadsheets or scripting to calculate the coordinates of the sample plots, but the general idea remains the same. -|WN| +What's Next? ------------------------------------------------------------------------------- In the next lesson you will see how to use the Atlas capabilities in QGIS to @@ -206,11 +206,6 @@ navigate to the sample plots assigned to them. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |calculateField| image:: /static/common/mActionCalculateField.png :width: 1.5em .. |gdal| image:: /static/common/gdal.png diff --git a/docs/training_manual/forestry/updating_stands.rst b/docs/training_manual/forestry/updating_stands.rst index 63fb974c61c..5cfd656b631 100644 --- a/docs/training_manual/forestry/updating_stands.rst +++ b/docs/training_manual/forestry/updating_stands.rst @@ -1,4 +1,4 @@ -|LS| Updating Forest Stands +Lesson: Updating Forest Stands =============================================================================== Now that you have digitized the information from the old inventory maps and @@ -17,8 +17,8 @@ constraints given by conservation regulations. CIR aerial photographs and add information from other datasets. -|basic| Comparing the Old Forest Stands to Current Aerial Photographs -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Comparing the Old Forest Stands to Current Aerial Photographs +------------------------------------------------------------------------------------------ The National Land Survey of Finland has an open data policy that allows you downloading a variety of geographical data like aerial imagery, traditional @@ -65,7 +65,7 @@ Next, you will create new forest stands for this image without using the old one Later you can compare them to see the differences. -|basic| Interpreting the CIR Image +:abbr:`★☆☆ (Basic level)` Interpreting the CIR Image ------------------------------------------------------------------------------- Let's digitize the same area that was covered by the old inventory, limited by @@ -115,8 +115,8 @@ Some points to consider: :align: center -|basic| |TY| Digitizing Forest Stands from CIR Imagery -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Try Yourself: Digitizing Forest Stands from CIR Imagery +------------------------------------------------------------------------------------ When digitizing the forest stands, you should try to get forest areas that are as homogeneous as possible in terms of tree species, forest age, stand density... @@ -164,8 +164,8 @@ You will see how to do that in the next lesson. You can add some extra information about conservation regulations that need to be taken into account for this area. -|basic| |FA| Updating Forest Stands with Conservation Information -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Updating Forest Stands with Conservation Information +---------------------------------------------------------------------------------------------- For the area you are working in, there are some conservation regulations that must be taken into account when doing the forest planning: @@ -253,8 +253,8 @@ showing the protection information for the Siberian flying squirrel. to actually delimitate area people should not go to? -|basic| |TY| Updating Forest Stands with Distance to the Stream -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Try Yourself: Updating Forest Stands with Distance to the Stream +--------------------------------------------------------------------------------------------- Following the same approach as for the protected squirrel locations you can now update your forest stands with protection information related to the stream. @@ -271,7 +271,7 @@ associated with the stream. When you are happy with the results, save your QGIS project. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have seen how to interpret CIR images to digitize forest stands. Of course @@ -280,7 +280,7 @@ information like soil maps would give better results, but you know now the basis for this type of task. And adding information from other datasets resulted to be quite a trivial task. -|WN| +What's Next? ------------------------------------------------------------------------------- The forest stands you digitized will be used for planning forestry operations @@ -296,14 +296,8 @@ of forest parameters. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |avoidIntersectionsLayers| image:: /static/common/mActionAvoidIntersectionsLayers.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |checkbox| image:: /static/common/checkbox.png :width: 1.3em .. |openTable| image:: /static/common/mActionOpenTable.png diff --git a/docs/training_manual/foreword/intro.rst b/docs/training_manual/foreword/intro.rst index 76d03969ec6..32cf171e8c0 100644 --- a/docs/training_manual/foreword/intro.rst +++ b/docs/training_manual/foreword/intro.rst @@ -32,8 +32,8 @@ course outcomes. Each category contains information that is essential for the next one, so it's important to do all exercises that are at or below your level of experience. -|basic| Basic -............. +:abbr:`★☆☆ (Basic level)` Basic +................................ In this category, the course assumes that you have little or no prior experience with theoretical GIS knowledge or the operation of GIS software. @@ -44,8 +44,8 @@ by doing. When you complete the course, you will have a better concept of the possibilities of GIS, and how to harness their power via QGIS. -|moderate| Intermediate -....................... +:abbr:`★★☆ (Moderate level)` Intermediate +........................................... In this category, it is assumed that you have working knowledge and experience of the everyday uses of GIS software. @@ -57,8 +57,8 @@ also learn how to use analysis functions in QGIS. When you complete the course, you should be comfortable with using QGIS for all of the functions you usually need for everyday use. -|hard| Advanced -............... +:abbr:`★★★ (Advanced level)` Advanced +........................................ In this category, the assumption is that you are experienced with GIS software, have knowledge of and experience with spatial databases, using data on a remote server, perhaps writing scripts for analysis purposes, etc. @@ -94,14 +94,3 @@ folder. If you are an instructor, and would like to use more relevant data, you will find instructions for creating local data in the :ref:`tm_preparing_data` appendix. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/grass/grass_setup.rst b/docs/training_manual/grass/grass_setup.rst index 1763f7865d5..c026078ee54 100644 --- a/docs/training_manual/grass/grass_setup.rst +++ b/docs/training_manual/grass/grass_setup.rst @@ -1,4 +1,4 @@ -|LS| GRASS Setup +Lesson: GRASS Setup =============================================================================== Using GRASS in QGIS requires you to think of the interface in a slightly @@ -11,7 +11,7 @@ on the ``QGIS Desktop with GRASS`` icon. **The goal for this lesson:** To begin a GRASS project in QGIS. -|basic| |FA| Start a New GRASS Session +:abbr:`★☆☆ (Basic level)` Follow Along: Start a New GRASS Session ------------------------------------------------------------------------------- To launch GRASS from within QGIS, you need to activate it as with any other @@ -56,7 +56,7 @@ information visit the `GRASS website GRASS --> New Mapset` menu: @@ -117,7 +117,7 @@ geographic area you'll be working in, also known as Grass ``Region``. You will see that the GRASS Panel will become active and you can start to use all GRASS tools. -|basic| |FA| Loading Vector Data into GRASS +:abbr:`★☆☆ (Basic level)` Follow Along: Loading Vector Data into GRASS ------------------------------------------------------------------------------- You have now a blank map and before you can start to use all the GRASS tools @@ -130,7 +130,7 @@ with the first one. .. _grass_browser: -|basic| |FA| Load data using the QGIS Browser +:abbr:`★☆☆ (Basic level)` Follow Along: Load data using the QGIS Browser ............................................................................... In section :ref:`browser_panel_tm` we saw that the easiest and quickest way to @@ -164,7 +164,7 @@ layer. You can now load in QGIS the imported layer like all the other layers. Browser Panel. This will speed up incredibly your workflow! -|basic| |FA| Load data using the GRASS Panel +:abbr:`★☆☆ (Basic level)` Follow Along: Load data using the GRASS Panel ............................................................................... We will use now the *long* method to load the :file:`rivers.shp` layer into the @@ -193,7 +193,7 @@ same Mapset. .. figure:: img/grass_tool_selected.png :align: center - .. note:: |hard| Note the extra import options provided under + .. note:: :abbr:`★★★ (Advanced level)` Note the extra import options provided under :guilabel:`Advanced Options`. These include the ability to add a WHERE clause for the SQL query used for importing the data. @@ -208,7 +208,7 @@ same Mapset. Now you are left with only the imported GRASS layer as displayed in your QGIS map. -|basic| |FA| Loading Raster Data into GRASS +:abbr:`★☆☆ (Basic level)` Follow Along: Loading Raster Data into GRASS ------------------------------------------------------------------------------- You can import a raster layer in the same ways we imported vector layers. @@ -241,7 +241,7 @@ We are going to import in the GRASS Mapset the layer |srtmFileName|. #. You may now remove the original |srtmFileName| layer. -|basic| |TY| Add Layers to Mapset +:abbr:`★☆☆ (Basic level)` Try Yourself: Add Layers to Mapset ------------------------------------------------------------------------------- Try to import in the GRASS Mapset the vector layers :file:`water.shp` and :file:`places.shp` from the :file:`exercise_data/shapefile/` folder. As we did @@ -255,7 +255,7 @@ to avoid confusion drop them in the Browser (see :ref:`grass_browser`) or by using the ``v.in.gdal.qgis`` for vector and ``r.in.gdal.qgis`` for raster layers. -|basic| Open an existing GRASS Mapset +:abbr:`★☆☆ (Basic level)` Open an existing GRASS Mapset ------------------------------------------------------------------------------- If you have an existing GRASS Mapset you can easily reopen it in another session of QGIS. @@ -266,7 +266,7 @@ Let's close the Mapset by clicking on the :guilabel:`Close Mapset` button of the :guilabel:`GRASS Tools` window. -|basic| |FA| Using the GRASS plugin +:abbr:`★☆☆ (Basic level)` Follow Along: Using the GRASS plugin ............................................................................... #. Click on the :guilabel:`Plugins --> GRASS --> Open Mapset` menu next to the @@ -286,7 +286,7 @@ That's it! The GRASS Panel will become active meaning that the Mapset has been correctly opened. -|basic| |FA| Using the QGIS Browser +:abbr:`★☆☆ (Basic level)` Follow Along: Using the QGIS Browser ............................................................................... Even faster and easier is opening a ``Mapset`` using the QGIS Browser: @@ -306,7 +306,7 @@ The Mapset is now open and ready to use! .. tip:: Right click on a GRASS Mapset offers you a lot of different settings. Try to explore them and see all the useful options. -|IC| +In Conclusion ------------------------------------------------------------------------------- The GRASS workflow for ingesting data is somewhat different from the QGIS @@ -314,7 +314,7 @@ method because GRASS loads its data into a spatial database structure. However, by using QGIS as a frontend, you can make the setup of a GRASS mapset easier by using existing layers in QGIS as data sources for GRASS. -|WN| +What's Next? ------------------------------------------------------------------------------- Now that the data is imported into GRASS, we can look at the advanced analysis @@ -327,17 +327,10 @@ operations that GRASS offers. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |grassLogo| image:: /static/common/grasslogo.png :width: 1.5em .. |grassMapsetOpen| image:: /static/common/grass_mapset_open.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |srtmFileName| replace:: :file:`srtm_41_19_4326.tif` .. |win| image:: /static/common/win.png :width: 1em diff --git a/docs/training_manual/grass/grass_tools.rst b/docs/training_manual/grass/grass_tools.rst index 8d56f3f455e..112b903840d 100644 --- a/docs/training_manual/grass/grass_tools.rst +++ b/docs/training_manual/grass/grass_tools.rst @@ -1,4 +1,4 @@ -|LS| GRASS Tools +Lesson: GRASS Tools =============================================================================== In this lesson we will present a selection of tools to give you an idea of the @@ -7,7 +7,7 @@ capabilities of GRASS. .. _grass_aspect: -|basic| |FA| Create an aspect map +:abbr:`★☆☆ (Basic level)` Follow Along: Create an aspect map ------------------------------------------------------------------------------- #. Open the :guilabel:`GRASS Tools` tab @@ -28,7 +28,7 @@ capabilities of GRASS. The :file:`g_aspect` layer is stored within the :guilabel:`grass_mapset` Mapset so you can remove the layer from the canvas and reload it whenever you want. -|basic| |FA| Get basic statistic of raster layer +:abbr:`★☆☆ (Basic level)` Follow Along: Get basic statistic of raster layer ------------------------------------------------------------------------------- We want to know some basic statistics of the :file:`g_dem` raster layer. @@ -49,7 +49,7 @@ We want to know some basic statistics of the :file:`g_dem` raster layer. :align: center -|moderate| |FA| The Reclass Tool +:abbr:`★★☆ (Moderate level)` Follow Along: The Reclass Tool ------------------------------------------------------------------------------- Reclassifying a raster layer is a very useful task. We just created the @@ -90,7 +90,7 @@ rules is very simple and the GRASS Manual contains very good description. manual: a lot of different examples are pointed out. -|moderate| |TY| Reclassify with your rules +:abbr:`★★☆ (Moderate level)` Try Yourself: Reclassify with your rules ------------------------------------------------------------------------------- Try to reclassify the :file:`g_dem` layer into 3 new categories: @@ -122,7 +122,7 @@ Try to reclassify the :file:`g_dem` layer into 3 new categories: :align: center -|moderate| |FA| The Mapcalc Tool +:abbr:`★★☆ (Moderate level)` Follow Along: The Mapcalc Tool ------------------------------------------------------------------------------ The Mapcalc tools is similar to the Raster Calculator of QGIS. You can perform @@ -177,7 +177,7 @@ This shows all the areas where the terrain is higher than 1000 meters. .. tip:: You can also save the formula you have created and load it in another QGIS project by clicking on the last button on the GRASS Mapcalc toolbar. -|IC| +In Conclusion ------------------------------------------------------------------------------- In this lesson, we have covered only a few of the many tools GRASS offers. To @@ -185,17 +185,3 @@ explore the capabilities of GRASS for yourself, open the :guilabel:`GRASS Tools` dialog and scroll down the :guilabel:`Modules List`. Or for a more structured approach, look under the :guilabel:`Modules Tree` tab, which organizes tools by type. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |basic| image:: /static/common/basic.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/grass/index.rst b/docs/training_manual/grass/index.rst index 0c3d521368e..007f92dd708 100644 --- a/docs/training_manual/grass/index.rst +++ b/docs/training_manual/grass/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| GRASS +Module: GRASS ******************************************************************************* GRASS (Geographic Resources Analysis Support System) is a well-known open @@ -12,12 +12,3 @@ QGIS allows you to make use of GRASS' powerful GIS tools directly. grass_setup grass_tools - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/map_composer/day_1_assignment.rst b/docs/training_manual/map_composer/day_1_assignment.rst index 729f2f0a1df..11091094e5e 100644 --- a/docs/training_manual/map_composer/day_1_assignment.rst +++ b/docs/training_manual/map_composer/day_1_assignment.rst @@ -9,7 +9,7 @@ to read and understand for someone who's unfamiliar with the data? If I saw this map on the Internet, or on a poster, or in a magazine, would it capture my attention? Would I want to read this map if it wasn't mine? -If you're doing this course at a |basic| Basic or |moderate| Intermediate +If you're doing this course at a ``★☆☆`` Basic or ``★★☆`` Intermediate level, read up on techniques from the more advanced sections. If you see something you'd like to do in your map, why not try to implement it? @@ -24,7 +24,7 @@ look at and the easier it is to understand at a glance, the better. Happy customizing! -|IC| +In Conclusion ------------------------------------------------------------------------------- The first four modules have taught you how to create and style a vector map. In @@ -32,14 +32,3 @@ the next four modules, you'll learn how to use QGIS for a complete GIS analysis. This will include creating and editing vector data; analyzing vector data; using and analyzing raster data; and using GIS to solve a problem from start to finish, using both raster and vector data sources. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |basic| image:: /static/common/basic.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/map_composer/dynamic_layout.rst b/docs/training_manual/map_composer/dynamic_layout.rst index 418ac23d653..c9ddf497b64 100644 --- a/docs/training_manual/map_composer/dynamic_layout.rst +++ b/docs/training_manual/map_composer/dynamic_layout.rst @@ -1,4 +1,4 @@ -|LS| Creating a Dynamic Print Layout +Lesson: Creating a Dynamic Print Layout ====================================================================== Now that you have learned to create a basic map layout we go a step @@ -7,8 +7,8 @@ extent and to the page properties, e.g. when you change the size of the page. Also, the date of creation will adapt dynamically. -|moderate| |FA| Creating the dynamic map canvas ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Creating the dynamic map canvas +---------------------------------------------------------------------------- #. Load the ESRI Shapefile format datasets :file:`protected_areas.shp`, :file:`places.shp`, :file:`rivers.shp` @@ -77,7 +77,7 @@ Also, the date of creation will adapt dynamically. The :guilabel:`Grid type` :guilabel:`Cross` is very well suited for our purposes. -|moderate| |FA| Creating the dynamic header +:abbr:`★★☆ (Moderate level)` Follow Along: Creating the dynamic header ------------------------------------------------------------------------------- #. Insert a rectangle which will contain the header with the @@ -139,7 +139,7 @@ Also, the date of creation will adapt dynamically. .. figure:: img/dynamic_layout_structure.png :align: center -|moderate| |FA| Creating labels for the dynamic header +:abbr:`★★☆ (Moderate level)` Follow Along: Creating labels for the dynamic header --------------------------------------------------------------------------------------- #. The title of your QGIS project can be included automatically. @@ -224,7 +224,7 @@ Also, the date of creation will adapt dynamically. .. figure:: img/dynamic_layout_organisation.png -|moderate| |FA| Adding pictures to the dynamic header +:abbr:`★★☆ (Moderate level)` Follow Along: Adding pictures to the dynamic header --------------------------------------------------------------------------------------- #. Use the |addImage| :sup:`Add Picture` button to place a picture @@ -263,8 +263,8 @@ Also, the date of creation will adapt dynamically. #. For :guilabel:`Width`, use ``21.027`` #. For :guilabel:`Height`, use ``21.157`` -|moderate| |FA| Creating the scalebar of the dynamic header ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Creating the scalebar of the dynamic header +---------------------------------------------------------------------------------------- #. To insert a scalebar in the header click on |scaleBar| :sup:`Add Scale Bar` and place it in the rectangle @@ -302,7 +302,7 @@ adapted. .. figure:: img/dynamic_layout.png :align: center -|WN| +What's Next? ------------------------------------------------------------------------------- On the next page, you will be given an assignment to complete. @@ -316,9 +316,6 @@ far. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? .. |addBasicShape| image:: /static/common/mActionAddBasicShape.png :width: 1.5em .. |addImage| image:: /static/common/mActionAddImage.png @@ -329,7 +326,6 @@ far. :width: 1.5em .. |label| image:: /static/common/mActionLabel.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |newLayout| image:: /static/common/mActionNewLayout.png :width: 1.5em .. |northArrow| image:: /static/common/north_arrow.png diff --git a/docs/training_manual/map_composer/index.rst b/docs/training_manual/map_composer/index.rst index 664d867fe77..4bfd9b8e6bf 100644 --- a/docs/training_manual/map_composer/index.rst +++ b/docs/training_manual/map_composer/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Laying out the Maps +Module: Laying out the Maps ******************************************************************************* In this module, you'll learn how to use the QGIS print layout to produce @@ -11,12 +11,3 @@ quality maps with all the requisite map components. map_composer dynamic_layout day_1_assignment - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/map_composer/map_composer.rst b/docs/training_manual/map_composer/map_composer.rst index 65054a77f36..9548d01bd76 100644 --- a/docs/training_manual/map_composer/map_composer.rst +++ b/docs/training_manual/map_composer/map_composer.rst @@ -1,4 +1,4 @@ -|LS| Using Print Layout +Lesson: Using Print Layout ====================================================================== Now that you've got a map, you need to be able to print it or to @@ -16,7 +16,7 @@ Both exporting and printing is handled via the *Print Layout*. **The goal for this lesson:** To use the QGIS *Print Layout* to create a basic map with all the required settings. -|basic| |FA| The Layout Manager +:abbr:`★☆☆ (Basic level)` Follow Along: The Layout Manager ---------------------------------------------------------------------- QGIS allows you to create multiple maps using the same map file. @@ -48,7 +48,7 @@ the :menuselection:`Project --> Layouts -->` menu, as in the image below. :align: center -|basic| |FA| Basic Map Composition +:abbr:`★☆☆ (Basic level)` Follow Along: Basic Map Composition ---------------------------------------------------------------------- In this example, the composition was already the way we wanted it. @@ -123,7 +123,7 @@ Ensure that yours is as well. :menuselection:`Save Project`. This is a convenient shortcut to the one in the main dialog. -|basic| |FA| Adding a Title +:abbr:`★☆☆ (Basic level)` Follow Along: Adding a Title ---------------------------------------------------------------------- Now your map is looking good on the page, but your readers/users are @@ -205,7 +205,7 @@ First, let us add a title. in the *Actions* Toolbar to be able to edit the items again. -|basic| |FA| Adding a Legend +:abbr:`★☆☆ (Basic level)` Follow Along: Adding a Legend ---------------------------------------------------------------------- The map reader also needs to be able to see what various things on @@ -226,7 +226,7 @@ Let's add a new legend. :align: center :width: 100% -|moderate| |FA| Customizing Legend Items +:abbr:`★★☆ (Moderate level)` Follow Along: Customizing Legend Items ---------------------------------------------------------------------- Not everything on the legend is necessary, so let's remove some @@ -260,7 +260,7 @@ This is the result: :align: center :width: 100% -|basic| |FA| Exporting Your Map +:abbr:`★☆☆ (Basic level)` Follow Along: Exporting Your Map ---------------------------------------------------------------------- .. note:: Did you remember to save your work often? @@ -316,7 +316,7 @@ For our purposes, we're going to use PDF. #. Remember to save your project file. -|IC| +In Conclusion ---------------------------------------------------------------------- Now you know how to create a basic static map layout. We can go a step further and create a map layout that adapts dynamically, with more @@ -329,9 +329,6 @@ layout items. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: .. |addLegend| image:: /static/common/mActionAddLegend.png :width: 1.5em .. |addMap| image:: /static/common/mActionAddMap.png @@ -340,7 +337,6 @@ layout items. :width: 1.5em .. |alignLeft| image:: /static/common/mActionAlignLeft.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |filePrint| image:: /static/common/mActionFilePrint.png :width: 1.5em .. |fileSave| image:: /static/common/mActionFileSave.png @@ -350,7 +346,6 @@ layout items. .. |lockItems| image:: /static/common/mActionLockItems.png :width: 1.5em .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |moveItemContent| image:: /static/common/mActionMoveItemContent.png :width: 1.5em .. |refresh| image:: /static/common/mActionRefresh.png diff --git a/docs/training_manual/online_resources/index.rst b/docs/training_manual/online_resources/index.rst index ce9cd3f191a..b5f96c44e4a 100644 --- a/docs/training_manual/online_resources/index.rst +++ b/docs/training_manual/online_resources/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Online Resources +Module: Online Resources ******************************************************************************* When considering data sources for a map, there is no need to be restricted to @@ -15,12 +15,3 @@ Services (WMS) and Web Feature Services (WFS). wms wfs - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/online_resources/wfs.rst b/docs/training_manual/online_resources/wfs.rst index c69fcfe9aec..ed34047fd47 100644 --- a/docs/training_manual/online_resources/wfs.rst +++ b/docs/training_manual/online_resources/wfs.rst @@ -1,4 +1,4 @@ -|LS| Web Feature Services +Lesson: Web Feature Services =============================================================================== A Web Feature Service (WFS) provides its users with GIS data in formats that @@ -8,7 +8,7 @@ map which you can't edit, a WFS gives you access to the features themselves. **The goal for this lesson:** To use a WFS and understand how it differs from a WMS. -|basic| |FA| Loading a WFS Layer +:abbr:`★☆☆ (Basic level)` Follow Along: Loading a WFS Layer ------------------------------------------------------------------------------- #. Start a new map. This is for demo purposes and won't be saved. @@ -77,7 +77,7 @@ you're loading have complicated shapes, a lot of attributes, or many features; or even if you're just loading a lot of layers. WFS layers typically take a very long time to load because of this. -|moderate| |FA| Querying a WFS Layer +:abbr:`★★☆ (Moderate level)` Follow Along: Querying a WFS Layer ------------------------------------------------------------------------------- Although it is of possible to query a WFS layer after having loaded @@ -148,7 +148,7 @@ sends only images. The most common type of WFS you'll encounter will therefore probably be on a local network or even on your own computer, rather than on the Internet. -|IC| +In Conclusion ------------------------------------------------------------------------------- WFS layers are preferable over WMS layers if you need direct access to the @@ -157,7 +157,7 @@ data that needs to be downloaded (which leads to speed problems and also a lack of easily available public WFS servers) it's not always possible to use a WFS instead of a WMS. -|WN| +What's Next? ------------------------------------------------------------------------------- Next, you'll see how to use QGIS Server to provide OGC services. @@ -169,15 +169,9 @@ Next, you'll see how to use QGIS Server to provide OGC services. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |dataSourceManager| image:: /static/common/mActionDataSourceManager.png :width: 1.5em .. |indicatorFilter| image:: /static/common/mIndicatorFilter.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |wfs| image:: /static/common/mIconWfs.png :width: 1.5em diff --git a/docs/training_manual/online_resources/wms.rst b/docs/training_manual/online_resources/wms.rst index e767007eec7..ce1fa9bcc79 100644 --- a/docs/training_manual/online_resources/wms.rst +++ b/docs/training_manual/online_resources/wms.rst @@ -1,6 +1,6 @@ .. _`wms-services`: -|LS| Web Mapping Services +Lesson: Web Mapping Services =============================================================================== A Web Mapping Service (WMS) is a service hosted on a remote server. Similar to @@ -15,7 +15,7 @@ if you pan or zoom on the map. **The goal for this lesson:** To use a WMS and understand its limitations. -|basic| |FA| Loading a WMS Layer +:abbr:`★☆☆ (Basic level)` Follow Along: Loading a WMS Layer ------------------------------------------------------------------------------- For this exercise, you can either use the basic map you made at the start of @@ -160,7 +160,7 @@ This will be covered in the next lesson, however. First, let's add another WMS layer. -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ------------------------------------------------------------------------------- #. Add the ``eAtlas`` WMS server at this URL: ``https://maps.eatlas.org.au/maps/wms`` @@ -188,7 +188,7 @@ First, let's add another WMS layer. #. After the layer is loaded, you can modify its :guilabel:`Opacity` value (under the :guilabel:`Transparency` properties tab) -|hard| |TY| +:abbr:`★★★ (Advanced level)` Try Yourself: ------------------------------------------------------------------------------- Part of the difficulty of using WMS is finding a good (free) server. @@ -219,7 +219,7 @@ Part of the difficulty of using WMS is finding a good (free) server. There are many other WMS servers to choose from. -|hard| |TY| +:abbr:`★★★ (Advanced level)` Try Yourself: ------------------------------------------------------------------------------- * Add the :guilabel:`bluemarble` layer from the :guilabel:`MapServer Demonstration Server`. @@ -244,19 +244,19 @@ Part of the difficulty of using WMS is finding a good (free) server. The Blue Marble data is more suitable at global or national scales -|IC| +In Conclusion ------------------------------------------------------------------------------- Using a WMS, you can add inactive maps as backdrops for your existing map data. -|FR| +Further Reading ------------------------------------------------------------------------------- * `Spatineo Directory `_ * `OpenStreetMap.org list of WMS servers `_ -|WN| +What's Next? ------------------------------------------------------------------------------- Now that you've added an inactive map as a backdrop, you'll be glad to know @@ -271,18 +271,10 @@ Feature Service (WFS). That's the topic of the next lesson. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |FR| replace:: Further Reading -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |addWmsLayer| image:: /static/common/mActionAddWmsLayer.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |dataSourceManager| image:: /static/common/mActionDataSourceManager.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |majorUrbanName| replace:: Swellendam .. |search| image:: /static/common/search.png :width: 1.5em diff --git a/docs/training_manual/processing/log.rst b/docs/training_manual/processing/log.rst index efc9057a12b..dd13925f1e7 100644 --- a/docs/training_manual/processing/log.rst +++ b/docs/training_manual/processing/log.rst @@ -22,16 +22,7 @@ The history is also interactive, and you can re--run any previous algorithm just For instance, try the following. Open the data corresponding to the first chapter of this manual and run the algorithm explained there. Now go to the log dialog and locate the last algorithm in the list, which corresponds to the algorithm you have just run. Double--click on it an a new result should be produced, just like when you run it using the normal dialog and calling it from the toolbox. -|hard| Advanced ---------------------- +:abbr:`★★★ (Advanced level)` Advanced You can also modify the algorithm. Just copy it, open the :menuselection:`Plugins --> Python console`, click on :menuselection:`Import class --> Import Processing class`, then paste it to re-run the analysis; change the text at will. To display the resulting file, type :kbd:`iface.addVectorLayer('/path/filename.shp', 'Layer name in legend', 'ogr')`. Otherwise, you can use :kbd:`processing.runandload`. - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |hard| image:: /static/common/hard.png diff --git a/docs/training_manual/qgis_plugins/fetching_plugins.rst b/docs/training_manual/qgis_plugins/fetching_plugins.rst index 96453e4a68f..aab3fbfeb6d 100644 --- a/docs/training_manual/qgis_plugins/fetching_plugins.rst +++ b/docs/training_manual/qgis_plugins/fetching_plugins.rst @@ -1,4 +1,4 @@ -|LS| Installing and Managing Plugins +Lesson: Installing and Managing Plugins =============================================================================== To begin using plugins, you need to know how to download, install and activate @@ -7,7 +7,7 @@ and :guilabel:`Plugin Manager`. **The goal for this lesson:** To understand and use QGIS' plugin system. -|basic| |FA| Managing Plugins +:abbr:`★☆☆ (Basic level)` Follow Along: Managing Plugins ------------------------------------------------------------------------------- #. To open the :guilabel:`Plugin Manager`, click on the menu item @@ -32,7 +32,7 @@ and :guilabel:`Plugin Manager`. .. _plugin_installation: -|basic| |FA| Installing New Plugins +:abbr:`★☆☆ (Basic level)` Follow Along: Installing New Plugins ------------------------------------------------------------------------------- The list of plugins that you can activate and deactivate draws from the plugins @@ -56,8 +56,8 @@ that you currently have installed. To install new plugins: .. note:: if the plugin has some error it will be listed in the :guilabel:`Invalid` tab. You can then contact the plugin owner to fix the problem. -|basic| |FA| Configuring Additional Plugin Repositories -------------------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Configuring Additional Plugin Repositories +------------------------------------------------------------------------------------ The plugins that are available to you for installation depend on which plugin *repositories* you are configured to use. @@ -95,25 +95,12 @@ you want to configure additional repositories. To do this: #. To install a plugin, click on it in the list and then on the :guilabel:`Install plugin` button. -|IC| +In Conclusion ------------------------------------------------------------------------------- Installing plugins in QGIS should be straightforward and effective! -|WN| +What's Next? ------------------------------------------------------------------------------- Next we'll introduce you to some useful plugins as examples. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png diff --git a/docs/training_manual/qgis_plugins/index.rst b/docs/training_manual/qgis_plugins/index.rst index 48ca31a24fd..e75f15f6e92 100644 --- a/docs/training_manual/qgis_plugins/index.rst +++ b/docs/training_manual/qgis_plugins/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Plugins +Module: Plugins ******************************************************************************* Plugins allow you to extend the functionality QGIS offers. In this module, @@ -10,12 +10,3 @@ you'll be shown how to activate and use plugins. fetching_plugins plugin_examples - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/qgis_plugins/plugin_examples.rst b/docs/training_manual/qgis_plugins/plugin_examples.rst index 5838fdfc59d..7b04d9f99f8 100644 --- a/docs/training_manual/qgis_plugins/plugin_examples.rst +++ b/docs/training_manual/qgis_plugins/plugin_examples.rst @@ -1,4 +1,4 @@ -|LS| Useful QGIS Plugins +Lesson: Useful QGIS Plugins =============================================================================== Now that you can install, enable and disable plugins, let's see how this can @@ -8,7 +8,7 @@ help you in practice by looking at some examples of useful plugins. and get acquainted with some useful plugins. -|basic| |FA| The QuickMapServices Plugin +:abbr:`★☆☆ (Basic level)` Follow Along: The QuickMapServices Plugin ------------------------------------------------------------------------------- The QuickMapServices plugin is a simple and easy to use plugin that adds base maps @@ -60,7 +60,7 @@ It is also possible to search trough the now available data providers :width: 80% -|basic| |FA| The QuickOSM Plugin +:abbr:`★☆☆ (Basic level)` Follow Along: The QuickOSM Plugin ------------------------------------------------------------------------------- With an incredible simple interface, the QuickOSM plugin allows you to download @@ -105,7 +105,7 @@ canvas. :kbd:`Advanced` menu in QuickOSM and choose where to save the data in the :guilabel:`Directory` menu. -|hard| |FA| The QuickOSM Query engine +:abbr:`★★★ (Advanced level)` Follow Along: The QuickOSM Query engine ------------------------------------------------------------------------------- The quickest way to download data from QuickOSM plugin is using the :guilabel:`Quick query` @@ -174,7 +174,7 @@ You can write complex queries using the `Overpass Query language `_. Take a look at some example and try to explore the query language. -|basic| |FA| The DataPlotly Plugin +:abbr:`★☆☆ (Basic level)` Follow Along: The DataPlotly Plugin ------------------------------------------------------------------------------- The **DataPlotly** plugin allows you to create `D3 `_ plots of vector @@ -244,14 +244,14 @@ in the map canvas. .. tip:: Each plot has its own manual page available in the |helpContents| tab. Try to explore all the plot types and see all the other settings available. -|IC| +In Conclusion ------------------------------------------------------------------------------- There are many useful plugins available for QGIS. Using the built-in tools for installing and managing these plugins, you can find new plugins and make optimum use of them. -|WN| +What's Next? ------------------------------------------------------------------------------- Next we'll look at how to use layers that are hosted on remote servers in real @@ -264,14 +264,8 @@ time. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? .. |addHtml| image:: /static/common/mActionAddHtml.png :width: 1.5em -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png .. |helpContents| image:: /static/common/mActionHelpContents.png :width: 1.5em .. |indicatorMemory| image:: /static/common/mIndicatorMemory.png diff --git a/docs/training_manual/qgis_server/index.rst b/docs/training_manual/qgis_server/index.rst index 1425fedde89..a8d02de65e5 100644 --- a/docs/training_manual/qgis_server/index.rst +++ b/docs/training_manual/qgis_server/index.rst @@ -1,7 +1,7 @@ .. _training_qgis_server: ******************************************************************************* -|MOD| QGIS Server +Module: QGIS Server ******************************************************************************* Module contributed by Tudor Bărăscu. @@ -15,12 +15,3 @@ To learn more about QGIS Server, read the :ref:`QGIS-Server-manual`. install wms - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/qgis_server/install.rst b/docs/training_manual/qgis_server/install.rst index a5c85260c1b..c346b103d85 100644 --- a/docs/training_manual/qgis_server/install.rst +++ b/docs/training_manual/qgis_server/install.rst @@ -2,7 +2,7 @@ .. _`label_qgisserver_tutorial`: -|LS| Install QGIS Server +Lesson: Install QGIS Server =============================================================================== **The goal for this lesson:** To learn how to install **QGIS Server** on Debian @@ -13,7 +13,7 @@ any Debian based distribution like Ubuntu and its derivatives. commands requiring admin permissions. In Debian you can work as admin (``root``), without using ``sudo``. -|moderate| |FA| Install from packages +:abbr:`★★☆ (Moderate level)` Follow Along: Install from packages ------------------------------------------------------------------------------- In this lesson we're going to do only the install from packages as shown @@ -31,7 +31,7 @@ Install QGIS Server with: QGIS Server should be used in production without QGIS Desktop (with the accompanying X Server) installed on the same machine. -|moderate| |FA| QGIS Server Executable +:abbr:`★★☆ (Moderate level)` Follow Along: QGIS Server Executable ------------------------------------------------------------------------------- The QGIS Server executable is ``qgis_mapserv.fcgi``. You can check where it has @@ -58,7 +58,7 @@ like: We'll see later on how to make WMS requests. -|hard| HTTP Server Configuration +:abbr:`★★★ (Advanced level)` HTTP Server Configuration ------------------------------------------------------------------------------- In order to access on the installed QGIS server from an Internet Browser we need to use an HTTP server. @@ -72,7 +72,7 @@ The Apache HTTP Server installation process is detailed in :ref:`httpserver` sec following the :ref:`Xvfb installation process `. -|moderate| |FA| Create another virtual host +:abbr:`★★☆ (Moderate level)` Follow Along: Create another virtual host ------------------------------------------------------------------------------- Let's create another Apache virtual host pointing to QGIS Server. You can @@ -121,29 +121,15 @@ choose whatever name you like (``coco.bango``, ``super.duper.training``, * If you try again to access the http://myhost/cgi-bin/qgis_mapserv.fcgi url you'll notice everything is working now! -|IC| +In Conclusion ------------------------------------------------------------------------------- You learned how to install different QGIS Server versions from packages, how to configure Apache with QGIS Server, on Debian based Linux distros. -|WN| +What's Next? ------------------------------------------------------------------------------- Now that you've installed QGIS Server and it's accessible through the HTTP protocol, we need to learn how to access some of the services it can offer. The topic of the next lesson is to learn how to access QGIS Server WMS services. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/qgis_server/wms.rst b/docs/training_manual/qgis_server/wms.rst index 1d98bdf715d..949fdda6fd3 100755 --- a/docs/training_manual/qgis_server/wms.rst +++ b/docs/training_manual/qgis_server/wms.rst @@ -1,4 +1,4 @@ -|LS| Serving WMS +Lesson: Serving WMS =============================================================================== The data used for this exercise are available in the :file:`qgis-server-tutorial-data` @@ -139,8 +139,8 @@ The above request should output the following image: Qgis Server response after a simple GetMap request -|moderate| |TY| Change the Image and Layers parameters -------------------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Try Yourself: Change the Image and Layers parameters +------------------------------------------------------------------------------------ Based on the request above, let's replace the ``countries`` layer with another. @@ -163,8 +163,8 @@ scale so you could get a blank image as response. You can also play around with others parameters from above, like changing the returned image type to ``image/png``. -|moderate| |FA| Use Filter, Opacities and Styles parameters -------------------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Use Filter, Opacities and Styles parameters +----------------------------------------------------------------------------------------- Let's do another request that adds another layer, some :ref:`basic parameters `, **FILTER** and **OPACITIES**, but also @@ -197,7 +197,7 @@ The above request should output the following image: As you can see from the above image, among other things, we told QGIS Server to render only **Germany** and **Italy** from the countries layer. -|moderate| |FA| Use Redlining +:abbr:`★★☆ (Moderate level)` Follow Along: Use Redlining ------------------------------------------------------------------------------- Let's do another GetMap request that makes use of the :ref:`redlining @@ -239,7 +239,7 @@ and we used the **REDLINING** feature to overlay a rectangle with the **QGIS Tutorial** label. GetPrint requests ------------------ +------------------- One very nice feature of QGIS Server is that it makes use of the QGIS Desktop print layouts. You can learn about it in the :ref:`wms_getprint` section. @@ -297,26 +297,12 @@ If you click the Print button in QWC you can interactively create ``GetPrint`` requests. You can also click the ``?`` icon in the QWC to access the available help so that you can better discover the QWC possibilities. -|IC| +In Conclusion ------------------------------------------------------------------------------- You learned how use QGIS Server to provide WMS Services. -|WN| +What's Next? ------------------------------------------------------------------------------- Next, you'll see how to use QGIS as a frontend for the famous GRASS GIS. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/rasters/changing_symbology.rst b/docs/training_manual/rasters/changing_symbology.rst index 31fb9019869..ba79fdbcbe4 100644 --- a/docs/training_manual/rasters/changing_symbology.rst +++ b/docs/training_manual/rasters/changing_symbology.rst @@ -1,4 +1,4 @@ -|LS| Changing Raster Symbology +Lesson: Changing Raster Symbology ====================================================================== Not all raster data are aerial photos. @@ -9,7 +9,7 @@ visible and useful. **The goal for this lesson:** To change the symbology for a raster layer. -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ---------------------------------------------------------------------- #. Use the :guilabel:`Browser` Panel to load :file:`srtm_41_19.tif`, @@ -34,8 +34,8 @@ QGIS has automatically applied a stretch to the pixel values of the image for visualization purposes, and we will learn more about how this works as we continue. -|basic| |FA| Changing Raster Layer Symbology ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Changing Raster Layer Symbology +------------------------------------------------------------------------- You have two different options to change the raster symbology: @@ -51,7 +51,7 @@ You have two different options to change the raster symbology: Choose the method you prefer to work with. -|basic| |FA| Singleband gray +:abbr:`★☆☆ (Basic level)` Follow Along: Singleband gray ---------------------------------------------------------------------- When you load a raster file, if it is not a photo image like the ones @@ -95,7 +95,7 @@ use them for the stretch: according to the mean value and the standard deviation -|basic| |FA| Singleband pseudocolor +:abbr:`★☆☆ (Basic level)` Follow Along: Singleband pseudocolor ---------------------------------------------------------------------- Grayscales are not always great styles for raster layers. @@ -124,7 +124,7 @@ displayed, going from blue for the lower areas to red for the higher ones. -|FA| Changing the transparency +Follow Along: Changing the transparency ---------------------------------------------------------------------- Sometimes changing the transparency of the whole raster layer can help @@ -166,7 +166,7 @@ To set these pixels as transparent, go to See? The corners are now 100% transparent. -|IC| +In Conclusion ---------------------------------------------------------------------- These are some the basic functions to get you started with raster @@ -182,7 +182,7 @@ Reference The SRTM dataset was obtained from `http://srtm.csi.cgiar.org/ `_ -|WN| +What's Next? ---------------------------------------------------------------------- Now that we can see our data displayed properly, let's investigate how we can @@ -195,12 +195,6 @@ analyze it further. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |contextHelp| image:: /static/common/mActionContextHelp.png :width: 1.5em .. |symbology| image:: /static/common/symbology.png diff --git a/docs/training_manual/rasters/data_manipulation.rst b/docs/training_manual/rasters/data_manipulation.rst index b09d326d514..5b6af2252b3 100644 --- a/docs/training_manual/rasters/data_manipulation.rst +++ b/docs/training_manual/rasters/data_manipulation.rst @@ -1,4 +1,4 @@ -|LS| Working with Raster Data +Lesson: Working with Raster Data ====================================================================== Raster data is quite different from vector data. @@ -15,7 +15,7 @@ existing GIS analysis. **The goal for this lesson:** To learn how to work with raster data in QGIS. -|basic| |FA| Loading Raster Data +:abbr:`★☆☆ (Basic level)` Follow Along: Loading Raster Data ---------------------------------------------------------------------- Raster data can be loaded with the same methods we used for vector @@ -40,7 +40,7 @@ There we have it - four aerial images covering our study area. .. _tm_virtual_raster: -|basic| |FA| Create a Virtual Raster +:abbr:`★☆☆ (Basic level)` Follow Along: Create a Virtual Raster ---------------------------------------------------------------------- Now as you can see from this, your solution layer lies across all four @@ -95,7 +95,7 @@ You can now remove the original four rasters from the raster. -|hard| Transforming Raster Data +:abbr:`★★★ (Advanced level)` Transforming Raster Data ---------------------------------------------------------------------- The above methods allow you to virtually merge datasets using a @@ -143,27 +143,13 @@ use the merge algorithm. .. figure:: img/merge_rasters.png :align: center -|IC| +In Conclusion ---------------------------------------------------------------------- QGIS makes it easy to include raster data into your existing projects. -|WN| +What's Next? ---------------------------------------------------------------------- Next, we'll use raster data that isn't aerial imagery, and see how symbolization is useful in the case of rasters as well. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png diff --git a/docs/training_manual/rasters/index.rst b/docs/training_manual/rasters/index.rst index a3108159f86..ad8137c860f 100644 --- a/docs/training_manual/rasters/index.rst +++ b/docs/training_manual/rasters/index.rst @@ -1,7 +1,7 @@ .. _tm_rasters: ******************************************************************************* -|MOD| Rasters +Module: Rasters ******************************************************************************* We've used rasters for digitizing before, but raster data can also be used @@ -14,12 +14,3 @@ directly. In this module, you'll see how it's done in QGIS. data_manipulation changing_symbology terrain_analysis - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/rasters/terrain_analysis.rst b/docs/training_manual/rasters/terrain_analysis.rst index afcf3fc8cb0..d785b4ffe51 100644 --- a/docs/training_manual/rasters/terrain_analysis.rst +++ b/docs/training_manual/rasters/terrain_analysis.rst @@ -1,4 +1,4 @@ -|LS| Terrain Analysis +Lesson: Terrain Analysis ====================================================================== Certain types of rasters allow you to gain more insight into the @@ -12,7 +12,7 @@ earlier. **The goal for this lesson:** To use terrain analysis tools to derive more information about the terrain. -|basic| |FA| Calculating a Hillshade +:abbr:`★☆☆ (Basic level)` Follow Along: Calculating a Hillshade ---------------------------------------------------------------------- We are going to use the same DEM layer as in the previous lesson. @@ -61,8 +61,8 @@ looks like a plaster cast. Can't we use it together with our other, more colorful rasters somehow? Of course we can, by using the hillshade as an overlay. -|basic| |FA| Using a Hillshade as an Overlay ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Using a Hillshade as an Overlay +-------------------------------------------------------------------------- A hillshade can provide very useful information about the sunlight at a given time of day. But it can also be used for aesthetic purposes, to make the map @@ -95,7 +95,7 @@ to find a balance that works for you. Remember to save the project when you are done. -|FA| Finding the best areas +Follow Along: Finding the best areas ---------------------------------------------------------------------- Think back to the estate agent problem, which we last addressed in the @@ -111,7 +111,7 @@ needs to have areas on it that: Let's find the best areas for them. -|moderate| |FA| Calculating the Slope +:abbr:`★★☆ (Moderate level)` Follow Along: Calculating the Slope ---------------------------------------------------------------------- *Slope* informs about how steep the terrain is. If, for example, @@ -135,7 +135,7 @@ slope value. Black pixels show flat terrain and white pixels, steep terrain: :align: center -|moderate| |TY| Calculating the aspect +:abbr:`★★☆ (Moderate level)` Try Yourself: Calculating the aspect ---------------------------------------------------------------------- *Aspect* is the compass direction that the slope of the terrain faces. An aspect @@ -163,8 +163,8 @@ layer saved along with the ``slope``. .. figure:: img/answer_aspect_result.png :align: center -|moderate| |FA| Finding the north-facing aspect ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Finding the north-facing aspect +---------------------------------------------------------------------------- Now, you have rasters showing you the slope as well as the aspect, but you have no way of knowing where ideal conditions are @@ -233,7 +233,7 @@ the conditions or not. Therefore the final result will be **False** (0) and **True** (1). -|moderate| |TY| More criteria +:abbr:`★★☆ (Moderate level)` Try Yourself: More criteria ---------------------------------------------------------------------- Now that you have done the aspect, create two new layers from the @@ -273,8 +273,8 @@ DEM. :align: center -|moderate| |FA| Combining Raster Analysis Results ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Combining Raster Analysis Results +-------------------------------------------------------------------------------- Now you have generated three raster layers from the DEM: @@ -323,7 +323,7 @@ The result: ((aspect@1 <= 90 OR aspect@1 >= 270) AND slope@1 <= 5) OR slope@1 <= 2 -|moderate| |FA| Simplifying the Raster +:abbr:`★★☆ (Moderate level)` Follow Along: Simplifying the Raster ---------------------------------------------------------------------- As you can see from the image above, the combined analysis has left us @@ -388,7 +388,7 @@ expected, viewing the metadata (and vector attributes, if applicable) can prove essential to solving the problem. -|moderate| |FA| Reclassifying the Raster +:abbr:`★★☆ (Moderate level)` Follow Along: Reclassifying the Raster ---------------------------------------------------------------------- We have used the *Raster calculator* to do calculations on raster @@ -461,7 +461,7 @@ With this reclassification and the paletted style applied to the layer, you can immediately differentiate the aspect areas. -|basic| |FA| Querying the raster +:abbr:`★☆☆ (Basic level)` Follow Along: Querying the raster ---------------------------------------------------------------------- Unlike vector layers, raster layers don't have an attribute table. @@ -528,7 +528,7 @@ We can use the *Value Tool* plugin to solve this problem. :align: center -|IC| +In Conclusion ---------------------------------------------------------------------- You've seen how to derive all kinds of analysis products from a DEM. @@ -538,7 +538,7 @@ and combine these results. Finally you learned how to reclassify a layer and how to query the results. -|WN| +What's Next? ---------------------------------------------------------------------- Now you have two analyses: the vector analysis which shows you the @@ -555,12 +555,5 @@ That's the topic for the next lesson, starting in the next module. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |identify| image:: /static/common/mActionIdentify.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/spatial_databases/geometry.rst b/docs/training_manual/spatial_databases/geometry.rst index 9bd4fc49af4..f8f0ae8784e 100644 --- a/docs/training_manual/spatial_databases/geometry.rst +++ b/docs/training_manual/spatial_databases/geometry.rst @@ -1,4 +1,4 @@ -|LS| Geometry Construction +Lesson: Geometry Construction =============================================================================== In this section we are going to delve a little deeper into how simple @@ -18,7 +18,7 @@ Going back to our :kbd:`address` database, let's get our streets table matching the others; i.e., having a constraint on the geometry, an index and an entry in the geometry_columns table. -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ------------------------------------------------------------------------------- * Modify the :kbd:`streets` table so that it has a geometry column of type @@ -188,7 +188,7 @@ By now our schema should be looking like this: :align: center -|TY| |hard| +Try Yourself: :abbr:`★★★ (Advanced level)` ------------------------------------------------------------------------------- Create city boundaries by computing the minimum convex hull of all addresses @@ -314,7 +314,7 @@ When you create a database, you can then specify which tablespace to use e.g.:: createdb --tablespace=homespace t4a -|IC| +In Conclusion ------------------------------------------------------------------------------- You've learned how to create more complex geometries using PostGIS statements. @@ -323,16 +323,3 @@ with geo-enabled databases through a GIS frontend. You usually won't need to actually enter these statements manually, but having a general idea of their structure will help you when using a GIS, especially if you encounter errors that would otherwise seem cryptic. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/spatial_databases/import_export.rst b/docs/training_manual/spatial_databases/import_export.rst index b823760c0ec..39966386ff0 100644 --- a/docs/training_manual/spatial_databases/import_export.rst +++ b/docs/training_manual/spatial_databases/import_export.rst @@ -1,4 +1,4 @@ -|LS| Import and Export +Lesson: Import and Export =============================================================================== Of course, a database with no easy way to migrate data into it and out of it @@ -78,25 +78,14 @@ next module is largely devoted to using this tool, we will only briefly mention it here. -|IC| +In Conclusion ------------------------------------------------------------------------------- Importing and exporting data to and from the database can be done in many various ways. Especially when using disparate data sources, you will probably use these functions (or others like them) on a regular basis. -|WN| +What's Next? ------------------------------------------------------------------------------- Next we'll look at how to query the data we've created before. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? diff --git a/docs/training_manual/spatial_databases/index.rst b/docs/training_manual/spatial_databases/index.rst index 5bdc5e66c29..16a616e99ce 100644 --- a/docs/training_manual/spatial_databases/index.rst +++ b/docs/training_manual/spatial_databases/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Spatial Database Concepts with PostGIS +Module: Spatial Database Concepts with PostGIS ******************************************************************************* Spatial Databases allow the storage of the geometries of records inside a @@ -31,12 +31,3 @@ See also `PostGIS In Action `_. import_export spatial_queries geometry - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/spatial_databases/simple_feature_model.rst b/docs/training_manual/spatial_databases/simple_feature_model.rst index 4dfd4380547..2929ccde031 100644 --- a/docs/training_manual/spatial_databases/simple_feature_model.rst +++ b/docs/training_manual/spatial_databases/simple_feature_model.rst @@ -1,4 +1,4 @@ -|LS| Simple Feature Model +Lesson: Simple Feature Model =============================================================================== How can we store and represent geographic features in a database? In this @@ -59,7 +59,7 @@ You will notice that the geometry field type does not implicitly specify what This adds a constraint to the table so that it will only accept a point geometry or a null value. -|TY| |hard| +Try Yourself: :abbr:`★★★ (Advanced level)` ------------------------------------------------------------------------------- Create a new table called cities and give it some appropriate columns, @@ -113,7 +113,7 @@ The value :kbd:`4326` refers to the projection we are using; in this case, WGS 84, which is referred to by the number 4326 (refer to the earlier discussion about the EPSG). -|TY| |basic| +Try Yourself: :abbr:`★☆☆ (Basic level)` ............................................................................... Add an appropriate `geometry_columns` entry for your new cities layer @@ -191,7 +191,7 @@ Then click :guilabel:`OK` to create this connection. Back in the :guilabel:`Add PostGIS Layers` dialog, click :guilabel:`Connect` and add layers to your project as usual. -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ............................................................................... Formulate a query that shows a person's name, street name and position (from the @@ -222,13 +222,13 @@ the_geom column) as plain text. As you can see, our constraint allows nulls to be added into the database. -|IC| +In Conclusion ------------------------------------------------------------------------------- You have seen how to add spatial objects to your database and view them in GIS software. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you'll see how to import data into, and export data from, your database. @@ -240,12 +240,5 @@ Next you'll see how to import data into, and export data from, your database. please add it also to the substitutions.txt file in the source folder. -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |addPostgisLayer| image:: /static/common/mActionAddPostgisLayer.png :width: 1.5em -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/spatial_databases/spatial_functions.rst b/docs/training_manual/spatial_databases/spatial_functions.rst index 860ab230429..9d312a365e9 100644 --- a/docs/training_manual/spatial_databases/spatial_functions.rst +++ b/docs/training_manual/spatial_databases/spatial_functions.rst @@ -1,4 +1,4 @@ -|LS| PostGIS Setup +Lesson: PostGIS Setup =============================================================================== Setting up PostGIS functions will allow you to access spatial functions from @@ -220,24 +220,13 @@ Result: The :kbd:`srtext` is the projection definition in well known text (you may recognise this from .prj files in your shapefile collection). -|IC| +In Conclusion ------------------------------------------------------------------------------- You now have PostGIS functions installed in your copy of PostgreSQL. With this you'll be able to make use of PostGIS' extensive spatial functions. -|WN| +What's Next? ------------------------------------------------------------------------------- Next you'll learn how spatial features are represented in a database. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? diff --git a/docs/training_manual/spatial_databases/spatial_queries.rst b/docs/training_manual/spatial_databases/spatial_queries.rst index de1ec0b87de..6295836d7e0 100644 --- a/docs/training_manual/spatial_databases/spatial_queries.rst +++ b/docs/training_manual/spatial_databases/spatial_queries.rst @@ -1,4 +1,4 @@ -|LS| Spatial Queries +Lesson: Spatial Queries =============================================================================== Spatial queries are no different from other database queries. You can use the @@ -89,7 +89,7 @@ Result: "people_street_id_fkey" FOREIGN KEY (street_id) REFERENCES streets(id) -|TY| |moderate| +Try Yourself: :abbr:`★★☆ (Moderate level)` ------------------------------------------------------------------------------- Modify the cities table so its geometry column is spatially indexed. @@ -371,27 +371,14 @@ Further examples ... FROM building a GROUP BY a.name; -|IC| +In Conclusion ------------------------------------------------------------------------------- You have seen how to query spatial objects using the new database functions from PostGIS. -|WN| +What's Next? ------------------------------------------------------------------------------- Next we're going to investigate the structures of more complex geometries and how to create them using PostGIS. - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/vector_analysis/basic_analysis.rst b/docs/training_manual/vector_analysis/basic_analysis.rst index f7d7166e09c..bfe334605f3 100644 --- a/docs/training_manual/vector_analysis/basic_analysis.rst +++ b/docs/training_manual/vector_analysis/basic_analysis.rst @@ -1,4 +1,4 @@ -|LS| Vector Analysis +Lesson: Vector Analysis ====================================================================== Vector data can also be analyzed to reveal how different features @@ -11,7 +11,7 @@ using the tools that QGIS provides. analysis tools. -|basic| The GIS Process +:abbr:`★☆☆ (Basic level)` The GIS Process ---------------------------------------------------------------------- Before we start, it would be useful to give a brief overview of a @@ -24,7 +24,7 @@ The way to go about it is: #. Present the Results -|basic| The Problem +:abbr:`★☆☆ (Basic level)` The Problem ---------------------------------------------------------------------- Let's start off the process by deciding on a problem to solve. @@ -39,7 +39,7 @@ following criteria: #. Closer than 500m to a restaurant -|basic| The Data +:abbr:`★☆☆ (Basic level)` The Data ---------------------------------------------------------------------- To answer these questions, we are going to need the following data: @@ -63,8 +63,8 @@ If you want to download data from another area, jump to the region. -|basic| |FA| Start a Project and get the Data ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Start a Project and get the Data +------------------------------------------------------------------------- We first need to load the data to work with. @@ -120,7 +120,7 @@ The map with all the data should look like the following one: :align: center -|basic| |TY| Convert Layers' CRS +:abbr:`★☆☆ (Basic level)` Try Yourself: Convert Layers' CRS ---------------------------------------------------------------------- Because we are going to be measuring distances within our layers, we need to @@ -174,8 +174,8 @@ Feel free to choose the best workflow for yourself. Now that we have converted OSM data to a UTM projection, we can begin our calculations. -|basic| |FA| Analyzing the Problem: Distances From Schools and Roads ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Analyzing the Problem: Distances From Schools and Roads +------------------------------------------------------------------------------------------------- QGIS allows you to calculate distances between any vector object. @@ -269,7 +269,7 @@ Now there are no unnecessary subdivisions. .. _backlink-vector-analysis-basic-1: -|basic| |TY| Distance from schools +:abbr:`★☆☆ (Basic level)` Try Yourself: Distance from schools ---------------------------------------------------------------------- Use the same approach as above and create a buffer for your schools. @@ -304,7 +304,7 @@ Save the new layer in the :file:`vector_analysis.gpkg` file as ``schools_buffer_ In our example, the difference is subtle, but you can see that the buffer's edges are smoother with the higher value. -|basic| |FA| Overlapping Areas +:abbr:`★☆☆ (Basic level)` Follow Along: Overlapping Areas ---------------------------------------------------------------------- Now we have identified areas where the road is less than 50 meters @@ -342,7 +342,7 @@ You can find it in :menuselection:`Vector Overlay` group in the .. _select-by-location: -|basic| |FA| Extract the Buildings +:abbr:`★☆☆ (Basic level)` Follow Along: Extract the Buildings ---------------------------------------------------------------------- Now you've got the area that the buildings must overlap. @@ -376,8 +376,8 @@ Next, you want to extract the buildings in that area. from the layer list. -|moderate| |TY| Further Filter our Buildings ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Try Yourself: Further Filter our Buildings +------------------------------------------------------------------------- We now have a layer which shows us all the buildings within 1km of a school and within 50m of a road. @@ -415,8 +415,8 @@ within 500m of a restaurant. .. figure:: img/restaurant_buffer_result.png :align: center -|basic| |FA| Select Buildings of the Right Size ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Select Buildings of the Right Size +---------------------------------------------------------------------------- To see which buildings are of the correct size (more than 100 square meters), we need to calculate their size. @@ -453,7 +453,7 @@ Your map should now only show you those buildings which match our starting criteria and which are more than 100 square meters in size. -|basic| |TY| +:abbr:`★☆☆ (Basic level)` Try Yourself: ---------------------------------------------------------------------- Save your solution as a new layer, using the approach you learned @@ -461,14 +461,14 @@ above for doing so. The file should be saved within the same GeoPackage database, with the name ``solution``. -|IC| +In Conclusion ---------------------------------------------------------------------- Using the GIS problem solving approach together with QGIS vector analysis tools, you were able to solve a problem with multiple criteria quickly and easily. -|WN| +What's Next? ---------------------------------------------------------------------- In the next lesson, we will look at how to calculate the shortest @@ -481,17 +481,10 @@ distance along roads from one point to another. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |calculateField| image:: /static/common/mActionCalculateField.png :width: 1.5em .. |indicatorFilter| image:: /static/common/mIndicatorFilter.png :width: 1.5em .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |toggleEditing| image:: /static/common/mActionToggleEditing.png :width: 1.5em diff --git a/docs/training_manual/vector_analysis/index.rst b/docs/training_manual/vector_analysis/index.rst index 0af70bf497e..f46098fac95 100644 --- a/docs/training_manual/vector_analysis/index.rst +++ b/docs/training_manual/vector_analysis/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Vector Analysis +Module: Vector Analysis ******************************************************************************* Now that you have edited a few features, you must want to know what else one @@ -38,5 +38,4 @@ locate suitable farm properties for this new residential development. please add it also to the substitutions.txt file in the source folder. -.. |MOD| replace:: Module: .. |majorUrbanName| replace:: Swellendam diff --git a/docs/training_manual/vector_analysis/network_analysis.rst b/docs/training_manual/vector_analysis/network_analysis.rst index 9fef03af59f..edb6d473b18 100644 --- a/docs/training_manual/vector_analysis/network_analysis.rst +++ b/docs/training_manual/vector_analysis/network_analysis.rst @@ -1,4 +1,4 @@ -|LS| Network Analysis +Lesson: Network Analysis ====================================================================== Calculating the shortest distance between two points is a common GIS @@ -8,7 +8,7 @@ Tools for this can be found in the :guilabel:`Processing Toolbox`. **The goal for this lesson:** learn to use :guilabel:`Network analysis` algorithms. -|basic| |FA| The Tools and the Data +:abbr:`★☆☆ (Basic level)` Follow Along: The Tools and the Data ---------------------------------------------------------------------- You can find all the network analysis algorithms in the @@ -43,7 +43,7 @@ or the fastest path between two points of a network, given: Let's start. -|basic| Calculate the shortest path (point to point) +:abbr:`★☆☆ (Basic level)` Calculate the shortest path (point to point) ---------------------------------------------------------------------- The :menuselection:`Network analysis --> Shortest path (point to point)` @@ -107,7 +107,7 @@ Now that you know how to use the tool, feel free to test other locations. .. _network_fastest_path: -|moderate| |TY| Fastest path +:abbr:`★★☆ (Moderate level)` Try Yourself: Fastest path ---------------------------------------------------------------------- With the same data of the previous exercise, try to calculate the @@ -132,7 +132,7 @@ How much time do you need to go from the start to the end point? .. figure:: img/fastest_path_attribute.png :align: center -|moderate| |FA| Advanced options +:abbr:`★★☆ (Moderate level)` Follow Along: Advanced options ---------------------------------------------------------------------- Let us explore some more options of the Network Analysis tools. @@ -176,7 +176,7 @@ Now you know how many minutes it will take to get from one point to the other one if the whole network speed is at ``4 km/h``. -|hard| Shortest path with speed limit +:abbr:`★★★ (Advanced level)` Shortest path with speed limit ---------------------------------------------------------------------- The Network analysis toolbox has other interesting options. Looking at the following map: @@ -223,7 +223,7 @@ and we will manually choose the start and end points. As you can see the fastest route does not correspond to the shortest one. -|moderate| Service area (from layer) +:abbr:`★★☆ (Moderate level)` Service area (from layer) ---------------------------------------------------------------------- The :menuselection:`Network Analysis --> Service area (from layer)` algorithm can answer the question: given a point layer, what are all @@ -262,7 +262,7 @@ on the network from each point of the :guilabel:`network_points` layer. Cool isn't it? -|IC| +In Conclusion ---------------------------------------------------------------------- Now you know how to use :guilabel:`Network analysis` algorithm @@ -271,7 +271,7 @@ to solve shortest and fastest path problems. We are now ready to perform some spatial statistic on vector layer data. Let's go! -|WN| +What's Next? ---------------------------------------------------------------------- Next you'll see how to run spatial statistics algorithms on vector datasets. @@ -283,13 +283,5 @@ Next you'll see how to run spatial statistics algorithms on vector datasets. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |calculateField| image:: /static/common/mActionCalculateField.png :width: 1.5em -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png diff --git a/docs/training_manual/vector_analysis/reproject_transform.rst b/docs/training_manual/vector_analysis/reproject_transform.rst index 1edfba79a1a..d5b78304bbb 100644 --- a/docs/training_manual/vector_analysis/reproject_transform.rst +++ b/docs/training_manual/vector_analysis/reproject_transform.rst @@ -1,4 +1,4 @@ -|LS| Reprojecting and Transforming Data +Lesson: Reprojecting and Transforming Data ====================================================================== Let us talk about Coordinate Reference Systems (CRSs) again. @@ -7,7 +7,7 @@ means practically. **The goal for this lesson:** To reproject and transform vector datasets. -|basic| |FA| Projections +:abbr:`★☆☆ (Basic level)` Follow Along: Projections ---------------------------------------------------------------------- The CRS that all the data, as well as the map itself are in right now @@ -55,7 +55,7 @@ for the scale change and corrects it. Therefore, to keep the scale constant, we should reproject our data to use a PCS. -|basic| |FA| "On the Fly" Reprojection +:abbr:`★☆☆ (Basic level)` Follow Along: "On the Fly" Reprojection ---------------------------------------------------------------------- By default, QGIS reprojects data "on the fly". What this means is that even if @@ -97,8 +97,8 @@ in different CRSs. :guilabel:`continents` one. -|moderate| |FA| Saving a Dataset to Another CRS ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Saving a Dataset to Another CRS +--------------------------------------------------------------------------- Sometimes you need to export an existing dataset with another CRS. As we will see in the next lesson, if you need to make distance @@ -146,8 +146,8 @@ You can now compare the old and new projections of the layer and see that they are in two different CRS but they are still overlapping. -|hard| |FA| Creating Your Own Projection ----------------------------------------------------------------------- +:abbr:`★★★ (Advanced level)` Follow Along: Creating Your Own Projection +------------------------------------------------------------------------ There are many more projections than just those included in QGIS by default. You can also create your own projections. @@ -214,14 +214,14 @@ You can also create your own projections. .. figure:: img/van_grinten_projection.png :align: center -|IC| +In Conclusion ---------------------------------------------------------------------- Different projections are useful for different purposes. By choosing the correct projection, you can ensure that the features on your map are being represented accurately. -|FR| +Further Reading ---------------------------------------------------------------------- Materials for the *Advanced* section of this lesson were taken from `this @@ -229,7 +229,7 @@ article `. -|WN| +What's Next? ---------------------------------------------------------------------- In the next lesson you will learn how to analyze vector data using @@ -242,14 +242,6 @@ QGIS' various vector analysis tools. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |FR| replace:: Further Reading -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png -.. |hard| image:: /static/common/hard.png -.. |moderate| image:: /static/common/moderate.png .. |projectionEnabled| image:: /static/common/mIconProjectionEnabled.png :width: 1.5em .. |setProjection| image:: /static/common/mActionSetProjection.png diff --git a/docs/training_manual/vector_analysis/spatial_statistics.rst b/docs/training_manual/vector_analysis/spatial_statistics.rst index d4140816d19..7489864ff8b 100644 --- a/docs/training_manual/vector_analysis/spatial_statistics.rst +++ b/docs/training_manual/vector_analysis/spatial_statistics.rst @@ -1,4 +1,4 @@ -|LS| Spatial Statistics +Lesson: Spatial Statistics ====================================================================== .. note:: Lesson developed by Linfiniti and S Motala (Cape Peninsula @@ -11,7 +11,7 @@ QGIS includes many useful tools for statistical analysis. **The goal for this lesson:** To know how to use QGIS' spatial statistics tools within the :guilabel:`Processing Toolbox`. -|basic| |FA| Create a Test Dataset +:abbr:`★☆☆ (Basic level)` Follow Along: Create a Test Dataset ---------------------------------------------------------------------- We will create a random set of points, to get a dataset to work with. @@ -101,7 +101,7 @@ that red points are at a higher altitude. You will be using this sample layer for the rest of the statistical exercises. -|basic| |FA| Basic Statistics +:abbr:`★☆☆ (Basic level)` Follow Along: Basic Statistics ---------------------------------------------------------------------- Now get the basic statistics for this layer. @@ -168,8 +168,8 @@ Missing (null) values The number of missing values. -|basic| |FA| Compute statistics on distances between points ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Compute statistics on distances between points +--------------------------------------------------------------------------------------- #. Create a new temporary point layer. #. Enter edit mode, and digitize three points somewhere among the @@ -209,8 +209,8 @@ minimum and maximum for the distances to the nearest neighbors of the points in the input layer. -|basic| |FA| Nearest Neighbor Analysis (within layer) ----------------------------------------------------------------------- +:abbr:`★☆☆ (Basic level)` Follow Along: Nearest Neighbor Analysis (within layer) +--------------------------------------------------------------------------------- To do a nearest neighbor analysis of a point layer: @@ -229,7 +229,7 @@ To do a nearest neighbor analysis of a point layer: .. figure:: img/nearest_neighbour_example.png :align: center -|basic| |FA| Mean Coordinates +:abbr:`★☆☆ (Basic level)` Follow Along: Mean Coordinates ---------------------------------------------------------------------- To get the mean coordinates of a dataset: @@ -256,7 +256,7 @@ represent the average of all node coordinates. .. figure:: img/polygon_centroid_mean.png :align: center -|basic| |FA| Image Histograms +:abbr:`★☆☆ (Basic level)` Follow Along: Image Histograms ---------------------------------------------------------------------- The histogram of a dataset shows the distribution of its values. @@ -305,7 +305,7 @@ Keep in mind that a histogram shows you the distribution of values, and not all values are necessarily visible on the graph. -|basic| |FA| Spatial Interpolation +:abbr:`★☆☆ (Basic level)` Follow Along: Spatial Interpolation ---------------------------------------------------------------------- Let's say you have a collection of sample points from which you would @@ -336,8 +336,8 @@ As you can see, 100 sample points aren't really enough to get a detailed impression of the terrain. It gives a very general idea, but it can be misleading as well. -|moderate| |TY| Different interpolation methods ----------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Try Yourself: Different interpolation methods +--------------------------------------------------------------------------- #. Use the processes shown above to create a set of 10 000 random points @@ -362,14 +362,14 @@ density of sample points. Remember, larger samples give better results. -|IC| +In Conclusion ---------------------------------------------------------------------- QGIS has a number of tools for analyzing the spatial statistical properties of datasets. -|WN| +What's Next? ---------------------------------------------------------------------- Now that we have covered vector analysis, why not see what can be @@ -383,17 +383,10 @@ That is what we will do in the next module! please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |editCopy| image:: /static/common/mActionEditCopy.png :width: 1.5em .. |fileSave| image:: /static/common/mActionFileSave.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |radioButtonOn| image:: /static/common/radiobuttonon.png :width: 1.5em .. |sum| image:: /static/common/mActionSum.png diff --git a/docs/training_manual/vector_classification/attribute_data.rst b/docs/training_manual/vector_classification/attribute_data.rst index 0370d0d365f..323e51f7d8f 100644 --- a/docs/training_manual/vector_classification/attribute_data.rst +++ b/docs/training_manual/vector_classification/attribute_data.rst @@ -1,6 +1,6 @@ .. _tm_working_vector_data: -|LS| Vector Attribute Data +Lesson: Vector Attribute Data =============================================================================== Vector data is arguably the most common kind of data in the daily @@ -23,7 +23,7 @@ not only objects in locations, but also information about those objects. **The goal for this lesson:** To learn about the structure of vector data and explore the attribute data of an object -|basic| |FA| Viewing Layer Attributes +:abbr:`★☆☆ (Basic level)` Follow Along: Viewing Layer Attributes ------------------------------------------------------------------------------- It's important to know that the data you will be working with does not only @@ -129,7 +129,7 @@ You may now close the attribute table. .. _backlink-vector-explore-attribute-data: -|basic| |TY| Exploring Vector Data Attributes +:abbr:`★☆☆ (Basic level)` Try Yourself: Exploring Vector Data Attributes ------------------------------------------------------------------------------- #. How many fields are available in the :guilabel:`rivers` layer? @@ -163,7 +163,7 @@ You may now close the attribute table. values. If your data contains some *NULL* values, do not worry as long as most of your places have names. -|IC| +In Conclusion ------------------------------------------------------------------------------- You now know how to use the attribute table to see what is actually in the data @@ -172,7 +172,7 @@ that you care about. If you know which attributes you need, you can quickly decide if you're able to use a given dataset, or if you need to look for another one that has the required attribute data. -|WN| +What's Next? ------------------------------------------------------------------------------- Different attributes are useful for different purposes. Some of them can be @@ -186,12 +186,6 @@ this in the next lesson. please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |deselectActiveLayer| image:: /static/common/mActionDeselectActiveLayer.png :width: 1.5em .. |openTable| image:: /static/common/mActionOpenTable.png diff --git a/docs/training_manual/vector_classification/classification.rst b/docs/training_manual/vector_classification/classification.rst index 0b6dd78dd90..400fcafaaf2 100644 --- a/docs/training_manual/vector_classification/classification.rst +++ b/docs/training_manual/vector_classification/classification.rst @@ -1,4 +1,4 @@ -|LS| Classification +Lesson: Classification ====================================================================== Labels are a good way to communicate information such as the names of @@ -16,7 +16,7 @@ if there are numerous different landuse areas on the map. **The goal for this lesson:** To learn how to classify vector data effectively. -|basic| |FA| Classifying Nominal Data +:abbr:`★☆☆ (Basic level)` Follow Along: Classifying Nominal Data ---------------------------------------------------------------------- #. Open the :guilabel:`Layer Properties` dialog for the ``landuse`` @@ -74,7 +74,7 @@ or *NULL* value. Remember to save your map now so that you don't lose all your hard-earned changes! -|basic| |TY| More Classification +:abbr:`★☆☆ (Basic level)` Try Yourself: More Classification ---------------------------------------------------------------------- Use the knowledge you gained above to classify the ``buildings`` layer. @@ -83,7 +83,7 @@ Set the categorisation against the ``building`` field and use the .. note:: Remember to zoom into an urban area to see the results. -|moderate| |FA| Ratio Classification +:abbr:`★★☆ (Moderate level)` Follow Along: Ratio Classification ---------------------------------------------------------------------- There are four types of classification: *nominal*, *ordinal*, @@ -266,7 +266,7 @@ Now that we have the data, let's use them to render the ``landuse`` layer. :align: center -|moderate| |TY| Refine the Classification +:abbr:`★★☆ (Moderate level)` Try Yourself: Refine the Classification ---------------------------------------------------------------------- * Change the values of :guilabel:`Mode` and :guilabel:`Classes` until @@ -283,7 +283,7 @@ Now that we have the data, let's use them to render the ``landuse`` layer. :align: center -|hard| |FA| Rule-based Classification +:abbr:`★★★ (Advanced level)` Follow Along: Rule-based Classification ---------------------------------------------------------------------- It's often useful to combine multiple criteria for a classification, @@ -371,7 +371,7 @@ Now you have a map with |majorUrbanName| the most prominent residential area and other non-residential areas colored according to their size. -|IC| +In Conclusion ---------------------------------------------------------------------- Symbology allows us to represent the attributes of a layer in an @@ -381,7 +381,7 @@ of features, using any relevant attributes that we choose. Depending on the problems you face, you'll apply different classification techniques to solve them. -|WN| +What's Next? ---------------------------------------------------------------------- Now we have a nice-looking map, but how are we going to get it out of @@ -394,12 +394,6 @@ QGIS and into a format we can print out, or make into an image or PDF? That's th please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |calculateField| image:: /static/common/mActionCalculateField.png :width: 1.5em .. |checkbox| image:: /static/common/checkbox.png @@ -408,9 +402,7 @@ QGIS and into a format we can print out, or make into an image or PDF? That's th :width: 1.5em .. |expression| image:: /static/common/mIconExpression.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |newAttribute| image:: /static/common/mActionNewAttribute.png :width: 1.5em .. |radioButtonOn| image:: /static/common/radiobuttonon.png diff --git a/docs/training_manual/vector_classification/index.rst b/docs/training_manual/vector_classification/index.rst index 03927640cec..af18e9d11fd 100644 --- a/docs/training_manual/vector_classification/index.rst +++ b/docs/training_manual/vector_classification/index.rst @@ -1,5 +1,5 @@ ******************************************************************************* -|MOD| Classifying Vector Data +Module: Classifying Vector Data ******************************************************************************* Classifying vector data allows you to assign different symbols to features @@ -13,12 +13,3 @@ features. attribute_data label_tool classification - - -.. Substitutions definitions - AVOID EDITING PAST THIS LINE - This will be automatically updated by the find_set_subst.py script. - If you need to create a new substitution manually, - please add it also to the substitutions.txt file in the - source folder. - -.. |MOD| replace:: Module: diff --git a/docs/training_manual/vector_classification/label_tool.rst b/docs/training_manual/vector_classification/label_tool.rst index 672bd49e958..dbdf1a9b67d 100644 --- a/docs/training_manual/vector_classification/label_tool.rst +++ b/docs/training_manual/vector_classification/label_tool.rst @@ -1,4 +1,4 @@ -|LS| Labels +Lesson: Labels =============================================================================== Labels can be added to a map to show any information about an object. Any @@ -9,7 +9,7 @@ attribute data of a layer for their content. layer. -|basic| |FA| Using Labels +:abbr:`★☆☆ (Basic level)` Follow Along: Using Labels ------------------------------------------------------------------------------- First, ensure that the |labelingSingle| button is visible in the GUI: @@ -41,7 +41,7 @@ The map should now have labels like this: :align: center -|basic| |FA| Changing Label Options +:abbr:`★☆☆ (Basic level)` Follow Along: Changing Label Options ------------------------------------------------------------------------------- Depending on the styles you chose for your map in earlier lessons, you might @@ -99,8 +99,8 @@ are too far away from their point markers. You'll see that the labels are no longer overlapping their point markers. -|moderate| |FA| Using Labels Instead of Layer Symbology -------------------------------------------------------------------------------- +:abbr:`★★☆ (Moderate level)` Follow Along: Using Labels Instead of Layer Symbology +----------------------------------------------------------------------------------- In many cases, the location of a point doesn't need to be very specific. For example, most of the points in the ``places`` layer refer to entire @@ -151,7 +151,7 @@ For now, zoom out and click on the |showUnplacedLabel| button in the toolbar and see what happens. -|moderate| |TY| Customize the Labels +:abbr:`★★☆ (Moderate level)` Try Yourself: Customize the Labels ------------------------------------------------------------------------------- * Reset the label and symbol settings to have a point marker and a label offset @@ -196,7 +196,7 @@ and see what happens. -|moderate| |FA| Labeling Lines +:abbr:`★★☆ (Moderate level)` Follow Along: Labeling Lines ------------------------------------------------------------------------------- Now that you know how labeling works, there's an additional problem. Points and @@ -269,7 +269,7 @@ these options to use, depending on what you think seems more useful or what looks better. -|hard| |FA| Data Defined Settings +:abbr:`★★★ (Advanced level)` Follow Along: Data Defined Settings ------------------------------------------------------------------------------- #. Deactivate labeling for the ``roads`` layer @@ -309,7 +309,7 @@ field matches ``town`` are displayed in italics. :align: center -|hard| |TY| Using Data Defined Settings +:abbr:`★★★ (Advanced level)` Try Yourself: Using Data Defined Settings ------------------------------------------------------------------------------- .. note:: We're jumping ahead a bit here to demonstrate some advanced labeling @@ -348,7 +348,7 @@ field matches ``town`` are displayed in italics. :align: center -|hard| Further Possibilities With Labeling +:abbr:`★★★ (Advanced level)` Further Possibilities With Labeling ------------------------------------------------------------------------------- We can't cover every option in this course, but be aware that the @@ -369,14 +369,14 @@ in edit mode.) Feel free to explore more possibilities of the labeling system. -|IC| +In Conclusion ------------------------------------------------------------------------------- You've learned how to use layer attributes to create dynamic labels. This can make your map a lot more informative and stylish! -|WN| +What's Next? ------------------------------------------------------------------------------- Now that you know how attributes can make a visual difference for your map, how @@ -390,21 +390,13 @@ topic for the next lesson! please add it also to the substitutions.txt file in the source folder. -.. |FA| replace:: Follow Along: -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? -.. |basic| image:: /static/common/basic.png .. |changeLabelProperties| image:: /static/common/mActionChangeLabelProperties.png :width: 1.5em .. |dataDefine| image:: /static/common/mIconDataDefine.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |labelingSingle| image:: /static/common/labelingSingle.png :width: 1.5em .. |majorUrbanName| replace:: Swellendam -.. |moderate| image:: /static/common/moderate.png .. |moveLabel| image:: /static/common/mActionMoveLabel.png :width: 1.5em .. |newAttribute| image:: /static/common/mActionNewAttribute.png diff --git a/static/common/basic.png b/static/common/basic.png deleted file mode 100644 index 03573dfe251..00000000000 Binary files a/static/common/basic.png and /dev/null differ diff --git a/static/common/hard.png b/static/common/hard.png deleted file mode 100644 index 1469ea39cb2..00000000000 Binary files a/static/common/hard.png and /dev/null differ diff --git a/static/common/moderate.png b/static/common/moderate.png deleted file mode 100644 index 31a2af51830..00000000000 Binary files a/static/common/moderate.png and /dev/null differ diff --git a/substitutions.txt b/substitutions.txt index 4e5f6563fa7..73f7721a0e6 100644 --- a/substitutions.txt +++ b/substitutions.txt @@ -15,15 +15,7 @@ .. |8To24Bits| image:: /static/common/8-to-24-bits.png :width: 1.5em .. |CURRENT| replace:: 3.34 -.. |FA| replace:: Follow Along: -.. |FR| replace:: Further Reading -.. |IC| replace:: In Conclusion -.. |LS| replace:: Lesson: -.. |MOD| replace:: Module: .. |QG| replace:: QGIS -.. |RF| replace:: Results For -.. |TY| replace:: Try Yourself -.. |WN| replace:: What's Next? .. |action| image:: /static/common/action.png :width: 2em .. |actionRun| image:: /static/common/mAction.png @@ -172,7 +164,6 @@ :width: 1.5em .. |avoidIntersectionsLayers| image:: /static/common/mActionAvoidIntersectionsLayers.png :width: 1.5em -.. |basic| image:: /static/common/basic.png .. |basicStatistics| image:: /static/common/mAlgorithmBasicStatistics.png :width: 1.5em .. |browserCollapse| image:: /static/common/browser_collapse.png @@ -522,7 +513,6 @@ :width: 1.5em .. |handleStoreFilterExpressionUnchecked| image:: /static/common/mActionHandleStoreFilterExpressionUnchecked.png :width: 1.5em -.. |hard| image:: /static/common/hard.png .. |heatmap| image:: /static/common/heatmap.png :width: 1.5em .. |heatmapSymbol| image:: /static/common/rendererHeatmapSymbol.png @@ -757,7 +747,6 @@ :width: 1.5em .. |modelOutput| image:: /static/common/mIconModelOutput.png :width: 1.5em -.. |moderate| image:: /static/common/moderate.png .. |moveFeature| image:: /static/common/mActionMoveFeature.png :width: 1.5em .. |moveFeatureCopy| image:: /static/common/mActionMoveFeatureCopy.png