Skip to content

Commit

Permalink
Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Jan 30, 2025
2 parents 277446c + 3f694af commit 123b8d1
Show file tree
Hide file tree
Showing 309 changed files with 4,576 additions and 2,517 deletions.
6 changes: 1 addition & 5 deletions .jenkins/sign-macos-installer.jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ pipeline {
cmake --install jupedsim-build --config Release

# Cloning SUMO
git clone -q --filter=tree:0 --branch v1_21_0 https://github.com/eclipse-sumo/sumo.git
git clone -q --filter=tree:0 --branch main https://github.com/eclipse-sumo/sumo.git
export SUMO_HOME=\${WORKSPACE}/sumo

# FIXME (load file from main to have the current version)
curl -s -o "${WORKSPACE}/sumo/tools/build_config/buildMacOSInstaller.py" https://raw.githubusercontent.com/eclipse-sumo/sumo/main/tools/build_config/buildMacOSInstaller.py
curl -s -o "${WORKSPACE}/sumo/tools/requirements.txt" https://raw.githubusercontent.com/eclipse-sumo/sumo/main/tools/requirements.txt

# Creating virtual env for Python for the whole process
/opt/homebrew/bin/python3.13 -m venv env
env/bin/python3 -m pip install --quiet -r sumo/tools/requirements.txt
Expand Down
47 changes: 42 additions & 5 deletions build_config/docker/Dockerfile.ubuntu.git
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
# This Dockerfile installs everything for a full fledged SUMO with all tools runnable.
# If you don't need certain features and rather have a smaller container you can comment the unneeded parts below

FROM ubuntu:jammy
# We are dividing the build into multiple stages to reduce the size of the resulting image
FROM ubuntu:jammy as build

ENV SUMO_HOME=/usr/share/sumo
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -27,12 +28,48 @@ RUN apt-get -y install $(cat /opt/sumo/build_config/tools_req_deb.txt)

# JuPedSim
RUN cd /opt; git clone -b $JUPEDSIM_VERSION https://github.com/PedestrianDynamics/jupedsim
RUN cd /opt; cmake -B jupedsim-build -D CMAKE_INSTALL_PREFIX=jupedsim-install jupedsim; \
cmake --build jupedsim-build -j4 --config Release; cmake --install jupedsim-build --config Release; rm -rf jupedsim-build
RUN cd /opt; cmake -B jupedsim-build -D CMAKE_INSTALL_PREFIX=/install/usr jupedsim; \
cmake --build jupedsim-build -j4 --config Release; cmake --install jupedsim-build --config Release

# python packages needed for the tools (the ones where we do not have ubuntu packages)
RUN pip3 install -r /opt/sumo/tools/requirements.txt
# python packages needed for the docs (the ones where we do not have ubuntu packages)
RUN pip3 install -r /opt/sumo/docs/web/requirements.txt
RUN cd /opt/sumo; cmake -B cmake-build -DCMAKE_INSTALL_PREFIX=/usr -DSUMO_UTILS=TRUE; \
cd cmake-build; make -j8 all examples doc install; cd ..; rm -rf cmake-build

RUN cd /opt/sumo; cmake -B cmake-build -DCMAKE_INSTALL_PREFIX=/install/usr -DSUMO_UTILS=TRUE; \
cd cmake-build; make -j8 all examples doc install

# Now create actual image
FROM ubuntu:jammy

# Add metadata
LABEL org.opencontainers.image.authors="SUMO Developers <[email protected]>" \
org.opencontainers.image.url="https://ghcr.io/eclipse-sumo/sumo" \
org.opencontainers.image.source="https://github.com/eclipse-sumo/sumo/blob/main/build_config/docker/Dockerfile.ubuntu.git" \
org.opencontainers.image.documentation="https://sumo.dlr.de/docs/Developer/Docker.html" \
org.opencontainers.image.licenses="EPL-2.0 OR GPL-2.0-or-later"

# Setup environment
ENV SUMO_HOME=/usr/share/sumo
ARG DEBIAN_FRONTEND=noninteractive

# Getting build artifacts
COPY --from=build /install/usr /usr
# Get dependency lists
COPY --from=build /opt/sumo/build_config/build_req_deb.txt /tmp/build_req_deb.txt
COPY --from=build /opt/sumo/build_config/tools_req_deb.txt /tmp/tools_req_deb.txt
COPY --from=build /opt/sumo/tools/requirements.txt /tmp/requirements.txt

# Installing runtime dependencies (for simplicity we use the build dependencies. Possibility for optimization in the future)
RUN apt-get -qq update; \
apt-get -qq -y install $(cat /tmp/build_req_deb.txt) $(cat /tmp/tools_req_deb.txt) \
libavformat58 libopenscenegraph161 libswscale5; \
apt-get -qq clean autoclean; \
apt-get -qq -y autoremove; \
rm -rf /var/lib/apt/lists/*

# Installing tools dependencies for python
RUN pip3 install --no-cache-dir -r /tmp/requirements.txt

CMD ["/bin/bash", "-c"]

39 changes: 32 additions & 7 deletions data/po/it_sumo.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: sumo\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2025-01-06 11:22+0100\n"
"PO-Revision-Date: 2025-01-29 11:10+0000\n"
"PO-Revision-Date: 2025-01-30 12:17+0000\n"
"Last-Translator: Mirko Barthauer <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/eclipse-sumo/"
"applications/it/>\n"
Expand Down Expand Up @@ -4024,7 +4024,7 @@ msgstr ""
#: src/microsim/devices/MSDevice_Emissions.cpp:97
#, c-format
msgid "Unknown attribute '%' to write in emission output."
msgstr ""
msgstr "Attributo sconosciuto '%' da scrivere nell'uscita di emissioni."

#: src/microsim/devices/MSDevice_Example.cpp:48
msgid ""
Expand Down Expand Up @@ -4060,11 +4060,12 @@ msgstr "Registra oggetti in un raggio attorno a veicoli attrezzati"
#: src/microsim/devices/MSDevice_FCD.cpp:138
#, c-format
msgid "Specified shape '%' for filtering fcd-output could not be found."
msgstr ""
msgstr "La forma specificata '%' per filtrate l'uscita FCD non è stata trovata."

#: src/microsim/devices/MSDevice_FCD.cpp:163
msgid "Could not load names of edges for filtering fcd-output from '%'."
msgstr ""
"Non ho potuto caricare i nome degli archi da '%' per filtrare l'uscita FCD."

#: src/microsim/devices/MSDevice_FCD.cpp:182
#, c-format
Expand All @@ -4073,7 +4074,7 @@ msgstr "Attributo sconosciuto '%' da emettere in uscita FCD."

#: src/microsim/devices/MSDevice_FCDReplay.cpp:61
msgid "FCD file to read"
msgstr ""
msgstr "File FCD da leggere"

#: src/microsim/devices/MSDevice_FCDReplay.cpp:216
msgid "Unknown edge '%' in fcd replay file for person '%'."
Expand Down Expand Up @@ -4119,22 +4120,28 @@ msgid ""
"Additional time the vehicle shall need to reach the intersection after the "
"signal turns green"
msgstr ""
"Tempo addizionale che il veicolo necessita per giungere all'incrocio dopo "
"che il signale diventa verde"

#: src/microsim/devices/MSDevice_GLOSA.cpp:63
msgid "Use queue in front of the tls for GLOSA calculation"
msgstr ""
msgstr "Usa la coda di veicoli a monte del semaforo per il calcolo GLOSA"

#: src/microsim/devices/MSDevice_GLOSA.cpp:66
msgid ""
"Override safety features - ignore the current light state, always follow "
"GLOSA's predicted state"
msgstr ""
"Non tenere conto delle funzioni di sicurezza - ignora lo stato del segnale e "
"segui sempre lo stato previsto da GLOSA"

#: src/microsim/devices/MSDevice_GLOSA.cpp:69
msgid ""
"Vehicles follow a perfect speed calculation - ignore speed calculations from "
"the CF model if not safety critical"
msgstr ""
"I veicoli seguono un calcolo di velocità perfetto - ignora i calcoli di "
"velocità tratti da modelli di guida se non sono critici per la sicurezza"

#: src/microsim/devices/MSDevice_GLOSA.cpp:345
msgid ""
Expand Down Expand Up @@ -4180,6 +4187,8 @@ msgid ""
"Use weight files given with option --weight-files for initializing edge "
"weights"
msgstr ""
"Usa i file di pesi dati con l'opzione --weight-files per inizializzare i "
"pesi di archi"

#: src/microsim/devices/MSDevice_Routing.cpp:84
msgid "The number of parallel execution threads used for rerouting"
Expand All @@ -4200,7 +4209,7 @@ msgstr "Calcola velocità medie separate per biciclette"

#: src/microsim/devices/MSDevice_Routing.cpp:96
msgid "Save adapting weights to FILE"
msgstr ""
msgstr "Salva pesi di adattamento in FILE"

#: src/microsim/devices/MSDevice_Routing.cpp:104
msgid ""
Expand Down Expand Up @@ -4571,17 +4580,24 @@ msgid ""
"measures ('%').\n"
"Please specify exactly one threshold for each measure."
msgstr ""
"L'elenco dato di valori soglia ('%') non è della stessa dimensione che "
"l'elenco di misure ('%').\n"
"Per favore specifica esattamente un valore soglia per ogni misura."

#: src/microsim/devices/MSDevice_StationFinder.cpp:62
msgid ""
"Time to wait for a rescue vehicle on the road side when the battery is empty"
msgstr ""
"Tempo di attesa sul lato della strada per un veicolo rimorchiatore quando la "
"batteria è scarica"

#: src/microsim/devices/MSDevice_StationFinder.cpp:64
msgid ""
"How to deal with a vehicle which has to stop due to low battery: [none, "
"remove, tow]"
msgstr ""
"Come procedere con un veicolo fermatosi per causa di batteria scarica: "
"[none, remove, tow]"

#: src/microsim/devices/MSDevice_StationFinder.cpp:66
msgid ""
Expand Down Expand Up @@ -4613,33 +4629,42 @@ msgstr ""

#: src/microsim/devices/MSDevice_StationFinder.cpp:78
msgid "Type of energy transfer"
msgstr ""
msgstr "Tipo di trasferimento di energia"

#: src/microsim/devices/MSDevice_StationFinder.cpp:80
msgid ""
"After this waiting time vehicle searches for a new station when the initial "
"one is blocked"
msgstr ""
"Dopo questo tempo d'attesa il veicolo inizia di nuovo a cercare una stazione "
"di ricarica se quella iniziale è occupata"

#: src/microsim/devices/MSDevice_StationFinder.cpp:82
msgid ""
"Only stops with a predicted duration of at least the given threshold are "
"considered for opportunistic charging."
msgstr ""
"Considera unicamente le fermate per la carica opportunistica che hanno una "
"durata stimata di almeno il valore soglia dato."

#: src/microsim/devices/MSDevice_StationFinder.cpp:84
msgid "Target state of charge after which the vehicle stops charging"
msgstr ""
"Traguardo di livello di carica dopo il quale il veicolo ferma la ricarica"

#: src/microsim/devices/MSDevice_StationFinder.cpp:86
msgid "State of charge the vehicle begins searching for charging stations"
msgstr ""
"Livello di carica allo quale il veicolo inizia a cercare delle stazioni di "
"ricarica"

#: src/microsim/devices/MSDevice_StationFinder.cpp:88
msgid ""
"State of charge below which the vehicle may look for charging opportunities "
"along its planned stops"
msgstr ""
"Livello di carica sotto il quale il veicolo può cercare della opportunità di "
"carica intorno alle sue fermate pianificate"

#: src/microsim/devices/MSDevice_StationFinder.cpp:90
msgid ""
Expand Down
Loading

0 comments on commit 123b8d1

Please sign in to comment.