Skip to content

Commit b00712c

Browse files
authored
Merge branch 'main' into fix#829
2 parents faed622 + f3f4347 commit b00712c

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

docs/user_guide/features/extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
JupyterGIS comes with a JupyterLab extension that embeds QGIS features directly into the JupyterLab UI.
66
This extension allows you to:
77

8-
- Open `.qgz` and `` .jGIS` `` files in JupyterLab
8+
- Open `.qgz` and `.jGIS` files in JupyterLab
99
- Create new `.jGIS` files
1010
- Edit those files by adding new vector or raster layers, modifying geometries, and performing spatial operations.
1111

docs/user_guide/tutorials/01-intro/index.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ We will explore the JupyterGIS user interface to help you become familiar with i
4242

4343
The elements shown in the figure above are:
4444

45-
1. The application Launcher helps you to select which application you want to start e.g. a Notebook, a Console, and another application such as a Terminal or open a GIS file (which can be either a JupyterGIS file or a QGIS file).
46-
2. Left Sidebar which contains a file browser, a list of tabs in the main work and of running kernels and terminals, the command palette, the table of contents, the extension manager, and the JupyterGIS extension which allows you to see the GIS layers list.
47-
3. GIS Layers List / Browser Panel
48-
4. Right Sidebar showing the property inspector (active in notebooks), the debugger, and GIS object properties, annotation and filters.
45+
1. Application Launcher: Where you select which application you want to start - e.g. a Notebook, a Console, another application such as a Terminal, or open a GIS file (which can be either a JupyterGIS file or a QGIS file).
46+
2. Left Sidebar: Contains a file browser, panels that show a list of open tabs in the main work space and for running kernels and terminals, collaboration features, the table of contents (for notebooks or other files with headers), the extension manager, and the JupyterGIS extension which allows you to see the GIS layers list.
47+
3. GIS Layers List / Browser Panel.
48+
4. Right Sidebar: Contains the property inspector (active in notebooks), kernal usage, the debugger, and GIS object properties, annotation and filters.
4949
5. The GIS object properties, annotations and filters of a selected GIS layer.
50-
6. The Jupyter toolbar menu which you will use with Jupyter Notebooks.
51-
7. The Log console (which you can use for debugging).
50+
6. The Jupyter Toolbar Menu: Used with Jupyter Notebooks.
51+
7. The Log Console: Used for debugging.
5252

53-
## Adding your first layers
53+
## Adding Your First Layers
5454

5555
We will start the JupyterGIS application and create a basic map.
5656

@@ -62,7 +62,7 @@ Launch JupyterGIS from your terminal or start an online version of JupyterGIS de
6262
jupyter lab
6363
```
6464

65-
### Add a vector Layer
65+
### Add a Vector Layer
6666

6767
Follow along to add a vector layer available online.
6868

@@ -72,11 +72,11 @@ Follow along to add a vector layer available online.
7272
:class: attention
7373
If you don't see **GIS File** (under the JupyterGIS icon) in the **Other** section of the application launcher, you may have an issue with the JupyterGIS installation or may have forgotten to install it. Please refer to the prerequisites at the top of this tutorial to continue.
7474
:::
75-
2. Open Layer Browser (see image below) and select for instance _OpenStreetMap.Mapnik_. An interactive map will appear and you will be able to zoom in and zoom out with your mouse.
75+
2. Open Layer Browser (see image below) and select _OpenStreetMap.Mapnik_. An interactive map will appear and you will be able to zoom in and zoom out with your mouse.
7676
![Open Layer Browser](images/OpenLayerBrowser.png)
7777
3. Click on the **+** to add a user-defined layer and select "New Shapefile Layer" to add a new vector layer (stored as a shapefile).
7878
![Add a Vector Layer](images/addVectorLayer.png)
79-
4. Set the path of the new shapefile Layer to `https://public.opendatasoft.com/api/explore/v2.1/catalog/datasets/georef-united-states-of-america-county/exports/shp` and click **Ok**.
79+
4. Set the path of the new Shapefile Layer to an open source dataset of counties in the US - `https://public.opendatasoft.com/api/explore/v2.1/catalog/datasets/georef-united-states-of-america-county/exports/shp` - and click **Ok**.
8080
![Set Shapefile Layer](images/CreateShapefileLayer.png)
8181
5. You will see the new Shapefile Layer on the map. When clicking on the **Custom Shapefile Layer** (see figure below), you will also see the details of the object properties on the right of the map. You can pan and zoom to focus on your area of interest, or automatically focus on your new data layer by right-clicking on the **Custom Shapefile Layer** and selecting "Zoom to Layer".
8282
![View Shapefile Layer](images/viewShapefileLayer.png)
@@ -92,7 +92,7 @@ Let's rename the source called 'Custom Shapefile Source' to 'US Counties' so tha
9292
:label: Rename-layer
9393
:nonumber:
9494
95-
Rename the **Custom Shapefile Layer** with a meaningful name e.g., **US Counties** for the US County Shapefile Layer.
95+
Rename the **Custom Shapefile Layer** with a meaningful name - e.g., **US Counties** for the US County Shapefile Layer.
9696
9797
```
9898

@@ -103,11 +103,11 @@ Rename the **Custom Shapefile Layer** with a meaningful name e.g., **US Counties
103103

104104
:::{admonition} Ordering in the list of Sources versus Layers
105105
:class: warning
106-
Did you notice in the figures above that in the list of sources, the source for 'US Counties' appears before the source for 'OpenStreetMap.Mapmik'? In contrast, you can see the reverse order in the list of Layers.
106+
Did you notice in the figures above that in the list of sources, the source for 'US Counties' appears before the source for 'OpenStreetMap.Mapmik'? By contrast, you can see the reverse order in the list of Layers.
107107
The reason is that sources are ordered alphabetically, while layers are ordered based on the order in which they are added, with the top layer being the most recently added to your map.
108108
:::
109109

110-
## Adding a new layer on top of an existing one
110+
## Adding a New Layer on Top of an Existing One
111111

112112
Let's do an exercise to practice adding a new layer.
113113

@@ -122,9 +122,9 @@ Let's do an exercise to practice adding a new layer.
122122
```
123123
2. Zoom over New-York (USA) and check if you can see the newly added layer.
124124
3. Rename both the newly added layer and its corresponding source, e.g. 'NYC Roads'.
125-
4. Let's customize this new layer by changing the color. In the GIS Layer/Browser Panel, select the top layer (corresponds to the last layer you added) and right click to **Edit Symbology**. Then change the **Stroke Color** to a color of your choice. You can also change the Stroke Width and check the result after pressing \*_OK_.
125+
4. Let's customize this new layer by changing the color. In the GIS Layer/Browser Panel, select the top layer (corresponds to the last layer you added) and right click to **Edit Symbology**. Then change the **Stroke Color** to a color of your choice. You can also change the Stroke Width and check the result after clicking **Ok**.
126126
5. In a similar way, you can edit the symbology of the 'US Counties' Shapefile Layer we added earlier and change the **Fill Color**, **Stroke Color** and **Stroke Width**.
127-
6. Do you still see the roads in New-York? Try to adjust the **Opacity** value (default is 1) to a lower value for this Shapefile Layer. Can you see all your layers now?
127+
6. Do you still see the roads in New York? Try to adjust the **Opacity** value (default is 1) to a lower value for this Shapefile Layer. Can you see all your layers now?
128128

129129
```{exercise-end}
130130
@@ -133,7 +133,7 @@ Let's do an exercise to practice adding a new layer.
133133
```{solution} add-vector-layer
134134
:class: dropdown
135135
136-
After adding the new Shapefile Layer and zooming over New-York, you should have the following map:
136+
After adding the new Shapefile Layer and zooming over New York, you should have the following map:
137137
![View several shapefile Layer on the same map](images/severalShapefileLayers.png)
138138
139139
When you right click to edit the symbology, you should get the following pop-up menu:

0 commit comments

Comments
 (0)