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

Partially update content #37

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40,073 changes: 18,548 additions & 21,525 deletions geostyler-app/package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions geostyler-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"antd": "^4.16.1",
"geostyler": "^7.2.1",
"geostyler-openlayers-parser": "^3.0.1",
"geostyler-sld-parser": "^3.2.0",
"geostyler-wfs-parser": "^1.0.1",
"ol": "^6.5.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"geostyler": "^12.0.0",
"geostyler-openlayers-parser": "^4.1.1",
"geostyler-sld-parser": "^5.0.1",
"geostyler-wfs-parser": "^2.0.0",
"ol": "^7.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "3.4.1"
},
"scripts": {
Expand Down
9 changes: 5 additions & 4 deletions geostyler-app/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ function App() {

const wfsParams = {
url: 'https://ows-demo.terrestris.de/geoserver/terrestris/ows',
version: '1.1.0',
typeName: 'terrestris:bundeslaender',
srsName: 'EPSG:4326'
requestParams: {
version: '1.1.0',
typeName: 'terrestris:bundeslaender',
srsName: 'EPSG:4326'
}
};

const olStyle = new OlStyle({
Expand Down Expand Up @@ -70,4 +72,3 @@ function App() {
}

export default App;

8 changes: 4 additions & 4 deletions geostyler-app/src/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';

ReactDOM.render(
const root = createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
</React.StrictMode>
);

// If you want your app to work offline and load faster, you can change
Expand Down
3 changes: 2 additions & 1 deletion workshop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ In this workshop, we will create a basic application that allows users to style

The final application will look like this:

<!-- TODO replace gif with new one -->
[![Final application](./images/geostyler-workshop.gif)](./images/geostyler-workshop.gif)

## Overview
Expand All @@ -29,7 +30,7 @@ The following instructions and exercises require some already installed programs
Please make sure that the following programs are installed:

- A usable text editor, e.g. [VSCode](https://code.visualstudio.com/).
- [NodeJS](https://nodejs.org/en/) in version 12.
- [NodeJS](https://nodejs.org/en/) in version 16.

## Authors

Expand Down
12 changes: 6 additions & 6 deletions workshop/first-steps/install-geostyler.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
Since we are using npm, the installation of GeoStyler is straightforward.
Open a terminal and run the following command from the root of your application directory:

<pre><xmp>npm i geostyler@7.2.1</xmp></pre>
<pre><xmp>npm i geostyler@12.0.0</xmp></pre>

Additionally, we have to install a few dependencies, which can be installed in the same manner:

<pre><xmp>npm i ol@6 antd@4</xmp></pre>
<pre><xmp>npm i ol@7 antd@4</xmp></pre>

Through this, we install [OpenLayers](https://openlayers.org/) in version 6 and [antd](https://ant.design/) in version 4. OpenLayers will be used
Through this, we install [OpenLayers](https://openlayers.org/) in version 7 and [antd](https://ant.design/) in version 4. OpenLayers will be used
for the displaying of (preview-) maps and antd provides the very basic ui components, such as buttons.

# Install GeoStyler Parsers
Expand All @@ -22,6 +22,6 @@ In this workshop, we will use the SLD and OpenLayers Style Parser, as well as th

Execute following command to install the parsers:

<pre><xmp>npm i geostyler-sld-parser@3.0.1</xmp></pre>
<pre><xmp>npm i geostyler-openlayers-parser@3.0.0</xmp></pre>
<pre><xmp>npm i geostyler-wfs-parser@1.0.1</xmp></pre>
<pre><xmp>npm i geostyler-sld-parser@5.0.1</xmp></pre>
<pre><xmp>npm i geostyler-openlayers-parser@4.1.1</xmp></pre>
<pre><xmp>npm i geostyler-wfs-parser@2.0.0</xmp></pre>
2 changes: 1 addition & 1 deletion workshop/introduction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We will be using the node package manager ([npm](https://www.npmjs.com/)) for th
Furthermore, we will use the JavaScript standard [EcmaScript 6](https://en.wikipedia.org/wiki/ECMAScript) as programming language when developing.
We therefore suggest to do so as well, when using GeoStyler.

Since GeoStyler is a React-based component library, it is crucial to take a look at [React](https://reactjs.org/).
Since GeoStyler is a React-based component library, it is crucial to take a look at [React](https://react.dev/).

# GeoStyler Architecture

Expand Down
2 changes: 1 addition & 1 deletion workshop/style-parser/parse-ol.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ the `geostyler-openlayers-parser` and do not use an SLD string, but rather an Op
The installation of the `geostyler-openlayers-parser` was already done in a previous chapter via

```bash
npm i geostyler-openlayers-parser
npm i geostyler-openlayers-parser@4.1.1
```

Next, we have to import the parser
Expand Down
2 changes: 1 addition & 1 deletion workshop/style-parser/parse-sld.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ In order to parse SLD, we need two things. The `geostyler-sld-parser` and a SLD
We already installed the `geostyler-sld-parser` via

```bash
npm i geostyler-sld-parser
npm i geostyler-sld-parser@4.1.1
```

in a previous chapter. So now, we just have to import it into our application.
Expand Down