Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[training manual] Chapter 3 - Basic Maps #2847

Merged
merged 2 commits into from
Sep 8, 2018
Merged

[training manual] Chapter 3 - Basic Maps #2847

merged 2 commits into from
Sep 8, 2018

Conversation

ghtmtt
Copy link
Contributor

@ghtmtt ghtmtt commented Aug 9, 2018

Other PR that updates the Chapter 3 - Basic Maps of the Training Manual:

  • try to be consistent with all the :guilabel: :kbd: etc
  • added more example (geometry generator)
  • added more exercises
  • all screenshots have been updated
  • new pictures added

This (and also other) PR will results in some conflict for the answer.rst file. I think it is better to start merging single PR and fix conflicts when needed.

@ghtmtt ghtmtt added this to the QGIS 3.4 milestone Aug 9, 2018
* Click on the |signPlus| button to add another Symbol level.
* Move the new symbol at the bottom of the list clicking the |arrowDown| button.
* Choose a good color to fill the water polygons.
* Click on Marker of the Geometry generator symbology and change the circle with
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:guilabel:Marker

@@ -35,6 +35,10 @@ begin by changing the color of the :guilabel:`landuse` layer.
.. note:: By default, you can also access a layer's properties by
double-clicking on the layer in the Layers list.

.. tip:: the button |symbology| in the upper part of the Layer Panel will open
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The button...

@@ -56,7 +60,8 @@ A standard color dialog will appear.
|basic| |TY|
-------------------------------------------------------------------------------

Change the :guilabel:`water` layer to a light blue color.
Change the :guilabel:`water` layer to a light blue color. Try to use the Layer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the layer name (water) is considered as a guilabel?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK yes.. also in other chapter we considered layer names as guilabels. Other ideas?

Copy link
Collaborator

@DelazJ DelazJ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouaw! a lot to follow.
General comment (related to the other PRs review): I'd favor multiple small PRs with compact changes, eg text updates/new exercises/.... This way it's easy (for us, maybe not for you 😄) to understand the changes and the relation between exercise and answer and screenshot
Also see writing guidelines at https://docs.qgis.org/testing/en/docs/documentation_guidelines/writing.html#inline-tags about guilabel or kbd usage

and select :guilabel:`Dashed Line` from the :guilabel:`Pen Style` dropdown.
* Give the new, uppermost layer a thickness of :kbd:`1.3` and ensure that it is
a :guilabel:`Solid Line`.
* Give the base line a :guilabel:`Stroke width` of :kbd:`2` and a black color
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to QGIS writing guidelines it should be ``2`` instead of :kbd: (some general documentation on the sphinx roles usage at http://www.sphinx-doc.org/en/stable/markup/inline.html#other-semantic-markup)

@@ -42,28 +42,28 @@ coordinate plane. It is usually used to store discrete features, like roads and
city blocks.


.. _backlink-vector-load-shapefiles-1:
.. _backlink-vector-load-geopackage-1:

|basic| |FA| Loading Vector Data From Shapefiles
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that the appropriate title? Actually it looks like the content of the section mixes shapefiles and gpkg information. Hard to follow to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my fault. Actually the section explains how to load geopackage layers, so the title is wrong

@@ -73,24 +73,25 @@ same method:

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
Microsoft Access. GIS applications can also make use of databases. GIS-specific
Libreoffice Base. GIS applications can also make use of databases. GIS-specific
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LibreOffice (but while I understand the intention, is that more meaningful than MS Access for most of our users?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to avoid to mention Windows software :P

@@ -58,7 +58,7 @@ Refer back to the :ref:`browser_panel_tm` and to :ref:`load_geopackage` sections
|RF| *Working with Vector Data*
-------------------------------------------------------------------------------

.. _vector-load-shapefiles-1:
.. _vector-load-geopackage-1:

|basic| *Shapefiles*
...............................................................................
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shapefile title but geopackage anchor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, done

name, but different file types. Shapefiles are easy to send back and forth, and
most GIS software can read them.
name, but different file types. GeoPackage layers are easy to send back and forth,
and most GIS software can read them.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this description is not about gpkg

@@ -101,6 +102,14 @@ database file on your computer.
* Click on the :kbd:`landuse` layer to select it, then click
:menuselection:`Add`

Adding a layer from a SpatiaLite database or from a GeoPackage archive is not
so different: in fact, both are spatial extension of the SQLite library.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My understanding was that we were focusing on shp vs gpkg so i fail to understand the steps using spatiaLite.
IMHO, first section should be about adding shapefiles, the next about adding same files from a gpkg db. Then, as a bonus, a note stating that spatiaLite is not that different from gpkg (for those that could be interested in exploring other formats). Did I get it wrong?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+0 . It is true that the main focus is on shp vs gpkg, but the chapter is not so specific. I think that a section mentioning SpatiaLite is worth to have.

Move a small paragraph with a comparison SL vs GP at the beginning of the section

the three buttons now reads "landuse.sqlite@...", followed by the path of the
database file on your computer.

Notice that the dropdown select above the three buttons now reads "landuse.sqlite@...",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop**-**down select?

* Click the :guilabel:`New` button.
* In the same :file:`epsg4326` folder, you should find the file
* In the same :file:`shapefiles` folder, you should find the file
:file:`landuse.sqlite`. Select it and click :guilabel:`Open`.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

weird to store a sqlite file in a folder named shapefiles...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct. Moved outside the folder and put it in the main root. A PR will follow in the data repository.

* It is enough to change only the :guilabel:`water` layer for now. An example
is below, but may look different depending on the color you chose.
* It is enough to select the :guilabel:`water` layer in the legend and then click
on the |symbology| button. Change the color with the one you want and best fits
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add the tooltip whenever we use a button? This way, when the icon changes in the application and we do not yet update it, we can expect that at least the label would help readers...

Copy link
Contributor Author

@ghtmtt ghtmtt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I removed also a meaningless link to a not existing exercise.

@@ -58,7 +58,7 @@ Refer back to the :ref:`browser_panel_tm` and to :ref:`load_geopackage` sections
|RF| *Working with Vector Data*
-------------------------------------------------------------------------------

.. _vector-load-shapefiles-1:
.. _vector-load-geopackage-1:

|basic| *Shapefiles*
...............................................................................
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, done

@@ -56,7 +60,8 @@ A standard color dialog will appear.
|basic| |TY|
-------------------------------------------------------------------------------

Change the :guilabel:`water` layer to a light blue color.
Change the :guilabel:`water` layer to a light blue color. Try to use the Layer
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK yes.. also in other chapter we considered layer names as guilabels. Other ideas?

@@ -42,28 +42,28 @@ coordinate plane. It is usually used to store discrete features, like roads and
city blocks.


.. _backlink-vector-load-shapefiles-1:
.. _backlink-vector-load-geopackage-1:

|basic| |FA| Loading Vector Data From Shapefiles
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my fault. Actually the section explains how to load geopackage layers, so the title is wrong

@@ -73,24 +73,25 @@ same method:

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
Microsoft Access. GIS applications can also make use of databases. GIS-specific
Libreoffice Base. GIS applications can also make use of databases. GIS-specific
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to avoid to mention Windows software :P

* Click the :guilabel:`New` button.
* In the same :file:`epsg4326` folder, you should find the file
* In the same :file:`shapefiles` folder, you should find the file
:file:`landuse.sqlite`. Select it and click :guilabel:`Open`.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correct. Moved outside the folder and put it in the main root. A PR will follow in the data repository.

@@ -101,6 +102,14 @@ database file on your computer.
* Click on the :kbd:`landuse` layer to select it, then click
:menuselection:`Add`

Adding a layer from a SpatiaLite database or from a GeoPackage archive is not
so different: in fact, both are spatial extension of the SQLite library.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+0 . It is true that the main focus is on shp vs gpkg, but the chapter is not so specific. I think that a section mentioning SpatiaLite is worth to have.

Move a small paragraph with a comparison SL vs GP at the beginning of the section

@ghtmtt
Copy link
Contributor Author

ghtmtt commented Sep 8, 2018

Ok guys, I'm going to merge this so we can clean the cue. Thanks for the review @DelazJ @yjacolin

@ghtmtt ghtmtt merged commit d0e52d6 into qgis:master Sep 8, 2018
@ghtmtt ghtmtt deleted the tm_chp3_basicmap branch September 10, 2018 06:25
@DelazJ DelazJ added the 3.4 QGIS 3.4 new features label Sep 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.4 QGIS 3.4 new features Training Manual
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants