Merge branch 'main' into develop

.github/workflows/publish.yaml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           architecture: x64
           distribution: adopt
 

CITATION.cff

@@ -1,21 +1,32 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
 cff-version: 1.2.0
-title: MATSim Scenario Template (Adjust title)
+title: The MATSim Open Lausitz Scenario
 message: >-
   If you use this software, please cite it using the
   metadata from this file.
 type: software
 authors:
+  - given-names: Simon
+    family-names: Meinhardt
+    email: [email protected]
+    affiliation: Technische Universität Berlin
+    orcid: 'https://orcid.org/0000-0002-6354-4529'
   - given-names: Christian
     family-names: Rakow
     email: [email protected]
     affiliation: Technische Universität Berlin
     orcid: 'https://orcid.org/0000-0003-3760-2243'
-  - given-names: Surname
-    family-names: Name
-    email: [email protected]
-
-url: "https://github.com/matsim-scenarios/matsim-scenario-template"
-date-released: 2023-01-01
-year: 2023
-version: 1.0
-license: AGPL-3.0
+  - given-names: Kai
+    family-names: Nagel
+    email: [email protected]
+    affiliation: Technische Universität Berlin
+    orcid: 'https://orcid.org/0000-0003-2775-6898'
+identifiers:
+  - type: doi
+    value: 10.5281/zenodo.13983108
+url: 'https://github.com/matsim-scenarios/matsim-lausitz'
+license: AGPL-3.0-only
+version: '2024.2'
+date-released: '2024-10-23'

README.md

@@ -36,14 +36,14 @@ Handling of large files within git is not without problems (git lfs files are no
 
 1. Open SimWrapper at https://simwrapper.github.io/site/ .
 1. Select Explore Data Sources -> VSP Public-SVN .
-1. Navigate to de -> lausitz -> lausitz-v1.0 (https://simwrapper.github.io/site/public/de/lausitz/output/v1.0).
+1. Navigate to de -> lausitz -> output -> choose version (https://simwrapper.github.io/site/public/de/lausitz/output/).
 1. Enjoy the dashboards and visualizations.
 
 ### Run VIA on output files
 
 1. Get VIA from https://www.simunto.com/via/.  (There is a free license for a small number of agents; that will probably work but only display a small number of vehicles/agents.)
-1. Go to https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/ .
-1. Decide for a scenario that you find interesting (e.g. `lausitz-v1.0`) and go into that directory.
+1. Go to https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/output/ .
+1. Decide for a scenario that you find interesting (e.g. `v2024.2`) and go into that directory.
 1. Inside there, look for an `output-*` directory that you find interesting and go into that directory.
 1. Download `*.output_network.xml.gz` and `*.output_events.xml.gz`.  Best make sure that they do not uncompress, e.g. by "Download linked file as ...".
 1. Get these files into VIA.  This can be achieved in various ways; one is to open VIA and then drag the files from a file browser into VIA.