Renaming OSM2ODR
This commit is contained in:
Axel1092
bernat
parent
8f5a5b43dc
commit
550c252813
|
|
@ -51,7 +51,7 @@ def get_libcarla_extensions():
|
|||
os.path.join(pwd, 'dependencies/lib/libRecast.a'),
|
||||
os.path.join(pwd, 'dependencies/lib/libDetour.a'),
|
||||
os.path.join(pwd, 'dependencies/lib/libDetourCrowd.a'),
|
||||
os.path.join(pwd, 'dependencies/lib/libconverter.a')]
|
||||
os.path.join(pwd, 'dependencies/lib/libosm2odr.a')]
|
||||
extra_link_args += ['-lxerces-c']
|
||||
extra_link_args += ['-lz']
|
||||
extra_compile_args = [
|
||||
|
|
@ -112,7 +112,7 @@ def get_libcarla_extensions():
|
|||
'rpc.lib', 'carla_client.lib',
|
||||
'libpng.lib', 'zlib.lib',
|
||||
'Recast.lib', 'Detour.lib', 'DetourCrowd.lib',
|
||||
'converter.lib', 'xerces-c_3.lib']
|
||||
'osm2odr.lib', 'xerces-c_3.lib']
|
||||
|
||||
# Search for files in 'PythonAPI\carla\dependencies\lib' that contains
|
||||
# the names listed in required_libs in it's file name
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
// Copyright (c) 2020 Computer Vision Center (CVC) at the Universitat Autonoma
|
||||
// de Barcelona (UAB).
|
||||
//
|
||||
// This work is licensed under the terms of the MIT license.
|
||||
// For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
#include <Converter.h>
|
||||
|
||||
class OSM2ODR {
|
||||
public:
|
||||
// static std::string ConvertOSMToOpenDRIVE(std::string osm_file, osm2odr::) {
|
||||
// return osm2odr::ConvertOSMToOpenDRIVE(osm_file);
|
||||
// }
|
||||
};
|
||||
|
||||
void export_converter() {
|
||||
using namespace osm2odr;
|
||||
using namespace boost::python;
|
||||
|
||||
class_<OSM2ODRSettings>("OSM2ODRSettings", init<>())
|
||||
.add_property("use_offsets", &OSM2ODRSettings::use_offsets, &OSM2ODRSettings::use_offsets)
|
||||
.add_property("offset_x", &OSM2ODRSettings::offset_x, &OSM2ODRSettings::offset_x)
|
||||
.add_property("offset_y", &OSM2ODRSettings::offset_y, &OSM2ODRSettings::offset_y)
|
||||
.add_property("default_lane_width", &OSM2ODRSettings::default_lane_width, &OSM2ODRSettings::default_lane_width)
|
||||
.add_property("elevation_layer_height", &OSM2ODRSettings::elevation_layer_height, &OSM2ODRSettings::elevation_layer_height)
|
||||
;
|
||||
|
||||
class_<OSM2ODR>("OSM2ODR", no_init)
|
||||
.def("convert_to_odr", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("OSM2ODRSettings") = OSM2ODRSettings()))
|
||||
.staticmethod("convert_to_odr")
|
||||
;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
// Copyright (c) 2020 Computer Vision Center (CVC) at the Universitat Autonoma
|
||||
// de Barcelona (UAB).
|
||||
//
|
||||
// This work is licensed under the terms of the MIT license.
|
||||
// For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
#include <OSM2ODR.h>
|
||||
|
||||
// Empty class to emulate the namespace in the PythonAPI
|
||||
class OSM2ODR {};
|
||||
|
||||
namespace osm2odr {
|
||||
std::ostream &operator<<(std::ostream &out, const OSM2ODRSettings &settings) {
|
||||
out << "Osm2odrSettings(use_offsets=" << (settings.use_offsets ? "true" : "false")
|
||||
<< ", offset_x=" << settings.offset_x << ", offset_y=" << settings.offset_y
|
||||
<< ", default_lane_width=" << settings.default_lane_width
|
||||
<< ", elevation_layer_height=" << settings.elevation_layer_height << ")";
|
||||
return out;
|
||||
}
|
||||
}
|
||||
|
||||
void export_osm2odr() {
|
||||
using namespace osm2odr;
|
||||
using namespace boost::python;
|
||||
|
||||
class_<OSM2ODRSettings>("Osm2odrSettings", init<>())
|
||||
.add_property("use_offsets", &OSM2ODRSettings::use_offsets, &OSM2ODRSettings::use_offsets)
|
||||
.add_property("offset_x", &OSM2ODRSettings::offset_x, &OSM2ODRSettings::offset_x)
|
||||
.add_property("offset_y", &OSM2ODRSettings::offset_y, &OSM2ODRSettings::offset_y)
|
||||
.add_property("default_lane_width", &OSM2ODRSettings::default_lane_width, &OSM2ODRSettings::default_lane_width)
|
||||
.add_property("elevation_layer_height", &OSM2ODRSettings::elevation_layer_height, &OSM2ODRSettings::elevation_layer_height)
|
||||
.def(self_ns::str(self_ns::self))
|
||||
;
|
||||
|
||||
class_<OSM2ODR>("osm2odr", no_init)
|
||||
.def("convert", &ConvertOSMToOpenDRIVE, (arg("osm_file"), arg("osm2odr_settings") = OSM2ODRSettings()))
|
||||
.staticmethod("convert")
|
||||
;
|
||||
}
|
||||
|
|
@ -198,7 +198,7 @@ static auto MakeCallback(boost::python::object callback) {
|
|||
#include "Commands.cpp"
|
||||
#include "TrafficManager.cpp"
|
||||
#include "LightManager.cpp"
|
||||
#include "Converter.cpp"
|
||||
#include "OSM2ODR.cpp"
|
||||
|
||||
#ifdef LIBCARLA_RSS_ENABLED
|
||||
#include "AdRss.cpp"
|
||||
|
|
@ -226,5 +226,5 @@ BOOST_PYTHON_MODULE(libcarla) {
|
|||
#ifdef LIBCARLA_RSS_ENABLED
|
||||
export_ad_rss();
|
||||
#endif
|
||||
export_converter();
|
||||
export_osm2odr();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,7 +179,10 @@ def main():
|
|||
'-x', '--xodr-path',
|
||||
metavar='XODR_FILE_PATH',
|
||||
help='load a new map with a minimum physical road representation of the provided OpenDRIVE')
|
||||
|
||||
argparser.add_argument(
|
||||
'--osm-path',
|
||||
metavar='OSM_FILE_PATH',
|
||||
help='load a new map with a minimum physical road representation of the provided OpenStreetMaps')
|
||||
if len(sys.argv) < 2:
|
||||
argparser.print_help()
|
||||
return
|
||||
|
|
@ -224,6 +227,31 @@ def main():
|
|||
enable_mesh_visibility=True))
|
||||
else:
|
||||
print('file not found.')
|
||||
elif args.osm_path is not None:
|
||||
if os.path.exists(args.osm_path):
|
||||
with open(args.osm_path) as od_file:
|
||||
try:
|
||||
data = od_file.read()
|
||||
except OSError:
|
||||
print('file could not be readed.')
|
||||
sys.exit()
|
||||
print('Converting OSM data to opendrive')
|
||||
xodr_data = carla.osm2odr.convert(data)
|
||||
print('load opendrive map.')
|
||||
vertex_distance = 2.0 # in meters
|
||||
max_road_length = 500.0 # in meters
|
||||
wall_height = 0.0 # in meters
|
||||
extra_width = 0.6 # in meters
|
||||
world = client.generate_opendrive_world(
|
||||
data, carla.OpendriveGenerationParameters(
|
||||
vertex_distance=vertex_distance,
|
||||
max_road_length=max_road_length,
|
||||
wall_height=wall_height,
|
||||
additional_width=extra_width,
|
||||
smooth_junctions=True,
|
||||
enable_mesh_visibility=True))
|
||||
else:
|
||||
print('file not found.')
|
||||
|
||||
else:
|
||||
world = client.get_world()
|
||||
|
|
|
|||
|
|
@ -21,21 +21,21 @@ rem ============================================================================
|
|||
|
||||
rem Set the visual studio solution directory
|
||||
rem
|
||||
set CONVERTER_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%converter-visualstudio\
|
||||
set CONVERTER_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\
|
||||
set OSM2ODR_VSPROJECT_PATH=%INSTALLATION_DIR:/=\%osm2odr-visualstudio\
|
||||
set OSM2ODR_INSTALL_PATH=%ROOT_PATH:/=\%PythonAPI\carla\dependencies\
|
||||
|
||||
if "%1"=="--rebuild" (
|
||||
rmdir "%CONVERTER_VSPROJECT_PATH%" /s /q
|
||||
rmdir "%OSM2ODR_VSPROJECT_PATH%" /s /q
|
||||
)
|
||||
|
||||
|
||||
if not exist "%CONVERTER_VSPROJECT_PATH%" mkdir "%CONVERTER_VSPROJECT_PATH%"
|
||||
cd "%CONVERTER_VSPROJECT_PATH%"
|
||||
if not exist "%OSM2ODR_VSPROJECT_PATH%" mkdir "%OSM2ODR_VSPROJECT_PATH%"
|
||||
cd "%OSM2ODR_VSPROJECT_PATH%"
|
||||
|
||||
cmake -G "Visual Studio 15 2017 Win64"^
|
||||
-DCMAKE_CXX_FLAGS_RELEASE="/MD /MP"^
|
||||
-DCMAKE_INSTALL_PREFIX="%CONVERTER_INSTALL_PATH:\=/%"^
|
||||
"%ROOT_PATH%\Util\Converter"
|
||||
-DCMAKE_INSTALL_PREFIX="%OSM2ODR_INSTALL_PATH:\=/%"^
|
||||
"%ROOT_PATH%\Util\OSM2ODR"
|
||||
cmake --build . --config Release --target install | findstr /V "Up-to-date:"
|
||||
|
||||
endlocal
|
||||
|
|
@ -6,12 +6,12 @@ source $(dirname "$0")/Environment.sh
|
|||
export CC=/usr/bin/clang-8
|
||||
export CXX=/usr/bin/clang++-8
|
||||
|
||||
CONVERTER_BASE_DIR=${CARLA_ROOT_FOLDER}/Util/Converter
|
||||
CONVERTER_BUILD_DIR=${CARLA_ROOT_FOLDER}/Build/converter-build
|
||||
CONVERTER_BIN_DIR=${CONVERTER_BASE_DIR}/bin
|
||||
[ ! -d ${CONVERTER_BUILD_DIR} ] && mkdir ${CONVERTER_BUILD_DIR}
|
||||
OSM2ODR_BASE_DIR=${CARLA_ROOT_FOLDER}/Util/OSM2ODR
|
||||
OSM2ODR_BUILD_DIR=${CARLA_ROOT_FOLDER}/Build/osm2odr-build
|
||||
OSM2ODR_BIN_DIR=${OSM2ODR_BASE_DIR}/bin
|
||||
[ ! -d ${OSM2ODR_BUILD_DIR} ] && mkdir ${OSM2ODR_BUILD_DIR}
|
||||
|
||||
cd ${CONVERTER_BUILD_DIR}
|
||||
cd ${OSM2ODR_BUILD_DIR}
|
||||
|
||||
case $1 in
|
||||
--rebuild)
|
||||
|
|
@ -19,9 +19,9 @@ case $1 in
|
|||
;;
|
||||
esac
|
||||
|
||||
cmake ${CONVERTER_BASE_DIR} \
|
||||
cmake ${OSM2ODR_BASE_DIR} \
|
||||
-G "Eclipse CDT4 - Ninja" \
|
||||
-DCMAKE_INSTALL_PREFIX=${LIBCARLA_INSTALL_CLIENT_FOLDER}
|
||||
|
||||
ninja converter
|
||||
ninja osm2odr
|
||||
ninja install
|
||||
|
|
@ -79,28 +79,28 @@ CarlaUE4Editor: LibCarla.server.release
|
|||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build
|
||||
|
||||
.PHONY: PythonAPI
|
||||
PythonAPI: LibCarla.client.release converter
|
||||
PythonAPI: LibCarla.client.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --py3
|
||||
|
||||
PythonAPI.2: LibCarla.client.release converter
|
||||
PythonAPI.2: LibCarla.client.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2
|
||||
|
||||
PythonAPI.3: LibCarla.client.release converter
|
||||
PythonAPI.3: LibCarla.client.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py3
|
||||
|
||||
PythonAPI.rebuild: LibCarla.client.release converter
|
||||
PythonAPI.rebuild: LibCarla.client.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild
|
||||
|
||||
PythonAPI.rss: LibCarla.client.rss.release converter
|
||||
PythonAPI.rss: LibCarla.client.rss.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --py3 --rss
|
||||
|
||||
PythonAPI.rss.2: LibCarla.client.rss.release converter
|
||||
PythonAPI.rss.2: LibCarla.client.rss.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py2 --rss
|
||||
|
||||
PythonAPI.rss.3: LibCarla.client.rss.release converter
|
||||
PythonAPI.rss.3: LibCarla.client.rss.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --py3 --rss
|
||||
|
||||
PythonAPI.rss.rebuild: LibCarla.client.rss.release converter
|
||||
PythonAPI.rss.rebuild: LibCarla.client.rss.release osm2odr
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild --rss
|
||||
|
||||
PythonAPI.docs:
|
||||
|
|
@ -150,5 +150,5 @@ pretty:
|
|||
build.utils: PythonAPI
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUtilsDocker.sh
|
||||
|
||||
converter:
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildConverter.sh $(ARGS)
|
||||
osm2odr:
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh $(ARGS)
|
||||
|
|
@ -55,7 +55,7 @@ benchmark: LibCarla
|
|||
@echo "Not implemented!"
|
||||
|
||||
.PHONY: PythonAPI
|
||||
PythonAPI: LibCarla converter
|
||||
PythonAPI: LibCarla osm2odr
|
||||
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --py3
|
||||
|
||||
server: setup
|
||||
|
|
@ -78,5 +78,5 @@ plugins:
|
|||
deploy:
|
||||
@"${CARLA_BUILD_TOOLS_FOLDER}/Deploy.bat" $(ARGS)
|
||||
|
||||
converter:
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildConverter.bat $(ARGS)
|
||||
osm2odr:
|
||||
@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat $(ARGS)
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
# Contributing to Eclipse Sumo
|
||||
|
||||
Thanks for your interest in this project.
|
||||
|
||||
## Project description
|
||||
|
||||
Eclipse Simulation of Urban Mobility (SUMO) is a free and open traffic
|
||||
simulation toolsuite. SUMO allows modelling and analyzing intermodal traffic
|
||||
systems, including road vehicles, public transport, cargo logistics and
|
||||
pedestrians. Included with SUMO is a wealth of supporting tools, which handle
|
||||
tasks like route finding, visualization, network import and emission
|
||||
calculation. SUMO can be enhanced with custom models and it provides various
|
||||
APIs to remotely control and influence the simulation.
|
||||
|
||||
* https://eclipse.org/sumo
|
||||
|
||||
## Developer resources
|
||||
|
||||
Information regarding source code management, builds, coding standards, and
|
||||
more.
|
||||
|
||||
* https://sumo.dlr.de/docs/Developer/Main.html
|
||||
|
||||
The project maintains the following source code repositories
|
||||
|
||||
* https://github.com/eclipse/sumo
|
||||
|
||||
We are happily reviewing pull requests against the master of this repository.
|
||||
For details see below and https://sumo.dlr.de/docs/FAQ.html#how_do_code_contributions_work.
|
||||
|
||||
In order to allow the development of separate external modules for SUMO (which are not
|
||||
part of the mainline repository) every source code directory lists the files and
|
||||
subdirectories where modfications need to be made available under the EPL and in a
|
||||
separate list which files / directories are considered interfaces to external modules,
|
||||
as an entry point see the [contribution README in the src dir](src/README_Contributing.md).
|
||||
|
||||
## Eclipse Contributor Agreement
|
||||
|
||||
Before your contribution can be accepted by the project team contributors must
|
||||
electronically sign the Eclipse Contributor Agreement (ECA).
|
||||
|
||||
* http://www.eclipse.org/legal/ECA.php
|
||||
|
||||
Commits that are provided by non-committers must have a Signed-off-by field in
|
||||
the footer indicating that the author is aware of the terms by which the
|
||||
contribution has been provided to the project. The non-committer must
|
||||
additionally have an Eclipse Foundation account and must have a signed Eclipse
|
||||
Contributor Agreement (ECA) on file.
|
||||
|
||||
For more information, please see the Eclipse Committer Handbook:
|
||||
https://www.eclipse.org/projects/handbook/#resources-commit
|
||||
|
||||
## Contact
|
||||
|
||||
Contact the project developers via the project's "dev" list.
|
||||
|
||||
* https://dev.eclipse.org/mailman/listinfo/sumo-dev
|
||||
|
|
@ -1 +0,0 @@
|
|||
Please refer to https://sumo.dlr.de/docs/ChangeLog.html
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
# Notices for Eclipse Sumo
|
||||
|
||||
This content is produced and maintained by the Eclipse Sumo project.
|
||||
|
||||
* Project home: https://eclipse.org/sumo
|
||||
|
||||
## Trademarks
|
||||
|
||||
Eclipse Sumo is a trademark of the Eclipse Foundation.
|
||||
|
||||
## Copyright
|
||||
|
||||
All content is the property of the respective authors or their employers. For
|
||||
more information regarding authorship of content, please consult the listed
|
||||
source code repository logs.
|
||||
|
||||
## Declared Project Licenses
|
||||
|
||||
This program and the accompanying materials are made available under the terms
|
||||
of the Eclipse Public License v. 2.0 which is available at
|
||||
http://www.eclipse.org/legal/epl-v20.html.
|
||||
This Source Code may also be made available under the following Secondary
|
||||
Licenses when the conditions for such availability set forth in the Eclipse
|
||||
Public License 2.0 are satisfied: GNU General Public License, version 2
|
||||
or later which is available at
|
||||
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
|
||||
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
|
||||
|
||||
## Source Code
|
||||
|
||||
The project maintains the following source code repositories:
|
||||
|
||||
* https://github.com/eclipse/sumo
|
||||
|
||||
## Third-party Content
|
||||
|
||||
This project leverages the following third party content.
|
||||
|
||||
Font Stash from 2017-09-23 (n/a)
|
||||
|
||||
* License: Zlib AND (MIT OR LicenseRef-Public-Domain)
|
||||
* Project: https://github.com/memononen/fontstash
|
||||
* Source: https://github.com/memononen/fontstash
|
||||
|
||||
FOX toolkit (1.6.55)
|
||||
|
||||
* License: LicenseRef-Fox-Toolkit-Addendum-to-License AND
|
||||
LicenseRef-Public-Domain AND X11
|
||||
* Project: http://www.fox-toolkit.org/
|
||||
* Source: ftp://ftp.fox-toolkit.org/pub/fox-1.6.55.zip
|
||||
|
||||
Google Design Icons (n/a)
|
||||
|
||||
* License: CC-BY-4.0
|
||||
* Project: http://google.com/design/
|
||||
|
||||
odrSpiral from 2017-05-03 (n/a)
|
||||
|
||||
* License: Apache-2.0
|
||||
* Project: https://github.com/DLR-TS/odrSpiral
|
||||
* Source: https://github.com/DLR-TS/odrSpiral
|
||||
|
||||
OpenStreetMap data files (n/a)
|
||||
|
||||
* License: ODbL-1.0
|
||||
* Project: http://www.openstreetmap.org/
|
||||
|
||||
Proj4 - (4.9.3)
|
||||
|
||||
* License: MIT AND LicenseRef-Public-Domain AND Apache-2.0
|
||||
* Project: https://proj4.org/
|
||||
|
||||
RTree (n/a)
|
||||
|
||||
* License: LicenseRef-Permissive
|
||||
* Project: http://superliminal.com/sources/sources.htm
|
||||
* Source: http://superliminal.com/sources/RTreeTemplate.zip
|
||||
|
||||
tcpip from 2012-09-28 (n/a)
|
||||
|
||||
* License: BSD-3-Clause
|
||||
* Project: https://github.com/itm/shawn
|
||||
* Source: https://github.com/itm/shawn/tree/master/src/apps/tcpip
|
||||
|
||||
Xerces-C++ (3.2.0)
|
||||
|
||||
* License: Apache-2.0
|
||||
* Project: http://xerces.apache.org/xerces-c/
|
||||
* Source:
|
||||
http://mirror.softaculous.com/apache//xerces/c/3/sources/xerces-c-3.2.0.tar.gz
|
||||
|
||||
## Cryptography
|
||||
|
||||
Content may contain encryption software. The country in which you are currently
|
||||
may have restrictions on the import, possession, and use, and/or re-export to
|
||||
another country, of encryption software. BEFORE using any encryption software,
|
||||
please check the country's laws, regulations and policies concerning the import,
|
||||
possession, or use, and re-export of encryption software, to see if this is
|
||||
permitted.
|
||||
|
||||
## Derivative Works
|
||||
|
||||
EPL requires that "derivative works" be licensed under the terms of the EPL
|
||||
whereas "separate modules of software" may be licensed arbitrarily. Please follow the links
|
||||
below for lists of files where modifications are considered derivative work.
|
||||
|
||||
We currently consider all modifications to [src](src/README_Contributing.md) and [tools](tools/README_Contributing.md) (including the subdirectories) as derivative work except for the following cases:
|
||||
- TraCI client applications that use the public TraCI client libraries
|
||||
- separate modules residing in [src](src/README_Contributing.md)
|
||||
- car following models that inherit from MSCFModel (excluding [modifications of the existing models](src/microsim/cfmodels/README_Contributing.md))
|
||||
- lane changing models that inherit from MSAbstractLaneChangeModel (excluding [modifications of the existing models](src/microsim/lcmodels/README_Contributing.md))
|
||||
- simulation output modules (excluding [changes to the existing classes](src/microsim/output/README_Contributing.md))
|
||||
- vehicle device modules (excluding [changes to the existing classes](src/microsim/devices/README_Contributing.md))
|
||||
- network import modules (excluding [changes to the existing classes](src/netimport/README_Contributing.md))
|
||||
- network export modules (excluding [changes to the existing classes](src/netwrite/README_Contributing.md))
|
||||
- software that build upon the existing Python and Java tools libraries (excluding [changes to the existing](tools/README_Contributing.md))
|
||||
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
<a href="https://sumo.dlr.de/docs"><p align="center"><img width=50% src="https://github.com/eclipse/sumo/blob/master/docs/web/docs/images/sumo-logo.svg"></p></a>
|
||||
|
||||
Eclipse SUMO - Simulation of Urban MObility
|
||||
===========================================
|
||||
|
||||
|
||||
[](https://ci.appveyor.com/project/eclipsewebmaster/sumo)
|
||||
|
||||
|
||||
What is SUMO
|
||||
------------
|
||||
|
||||
["Simulation of Urban MObility" (SUMO)](https://sumo.dlr.de/) is an open source,
|
||||
highly portable, microscopic traffic simulation package designed to handle
|
||||
large road networks and different modes of transport.
|
||||
|
||||
It is mainly developed by employees of the [Institute of Transportation Systems
|
||||
at the German Aerospace Center](https://www.dlr.de/ts).
|
||||
|
||||
|
||||
Where to get it
|
||||
---------------
|
||||
|
||||
You can download SUMO via our [downloads site](https://sumo.dlr.de/docs/Downloads.html).
|
||||
|
||||
As the program is still under development and is extended continuously, we advice you to
|
||||
use the latest sources from our GitHub repository. Using a command line client
|
||||
the following command should work:
|
||||
|
||||
git clone --recursive https://github.com/eclipse/sumo
|
||||
|
||||
|
||||
Contact
|
||||
-------
|
||||
|
||||
To stay informed, we have a mailing list for SUMO
|
||||
[you can subscribe](https://dev.eclipse.org/mailman/listinfo/sumo-user) to.
|
||||
Messages to the list can be sent to sumo-user@eclipse.org.
|
||||
SUMO announcements will be made through the sumo-announce@eclipse.org list;
|
||||
[you can subscribe](https://dev.eclipse.org/mailman/listinfo/sumo-announce) to as well.
|
||||
For further contact information have a look at the [this page](https://sumo.dlr.de/docs/Contact.html).
|
||||
|
||||
|
||||
Build and Installation
|
||||
----------------------
|
||||
|
||||
For Windows we provide pre-compiled binaries and CMake files to generate Visual Studio projects.
|
||||
If you want to develop under Windows, please also clone the dependent libraries using
|
||||
|
||||
git clone --recursive https://github.com/DLR-TS/SUMOLibraries
|
||||
|
||||
Using Linux you should have a look whether your distribution already contains sumo.
|
||||
There is also a [ppa for ubuntu users](https://launchpad.net/~sumo) and an
|
||||
[open build service instance](https://build.opensuse.org/project/show?project=home%3Abehrisch).
|
||||
If you want to build yourself, the steps for ubuntu are:
|
||||
|
||||
sudo apt-get install cmake python g++ libxerces-c-dev libfox-1.6-dev libgdal-dev libproj-dev libgl2ps-dev swig
|
||||
cd <SUMO_DIR> # please insert the correct directory name here
|
||||
export SUMO_HOME="$PWD"
|
||||
mkdir build/cmake-build && cd build/cmake-build
|
||||
cmake ../..
|
||||
make -j$(nproc)
|
||||
|
||||
For [detailed build instructions have a look at our Documentation](https://sumo.dlr.de/docs/Developer/Main.html#build_instructions).
|
||||
|
||||
|
||||
Getting started
|
||||
---------------
|
||||
|
||||
To get started with SUMO, take a look at the docs/tutorial and examples directories,
|
||||
which contain some example networks with routing data and configuration files.
|
||||
There is also user documentation provided in the docs/ directory and on the
|
||||
homepage.
|
||||
|
||||
|
||||
Bugs
|
||||
----
|
||||
|
||||
Please use for bugs and requests the [GitHub bug tracking tool](https://github.com/eclipse/sumo/issues)
|
||||
or file them to the list sumo-user@eclipse.org. Before
|
||||
filing a bug, please consider to check with a current repository checkout
|
||||
whether the problem has already been fixed.
|
||||
|
||||
We welcome patches, pull requests and other contributions! For details see [our contribution guidelines](CONTRIBUTING.md).
|
||||
|
||||
|
||||
License
|
||||
-------
|
||||
|
||||
SUMO is licensed under the [Eclipse Public License Version 2](https://eclipse.org/legal/epl-v20.html).
|
||||
For the licenses of the different libraries and supplementary code information is in the
|
||||
subdirectories and the [Documentation](https://sumo.dlr.de/docs/Libraries_Licenses.html).
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -15,10 +15,10 @@ set(netconvertlibs
|
|||
|
||||
#install(TARGETS netconvert RUNTIME DESTINATION bin)
|
||||
|
||||
set(converter_sources "Converter.cpp")
|
||||
#add_library(converter STATIC ${converter_sources})
|
||||
#target_link_libraries(converter ${netconvertlibs})
|
||||
#install(TARGETS converter ARCHIVE DESTINATION lib)
|
||||
set(osm2odr_sources "OSM2ODR.cpp")
|
||||
#add_library(osm2odr STATIC ${osm2odr_sources})
|
||||
#target_link_libraries(osm2odr ${netconvertlibs})
|
||||
#install(TARGETS osm2odr ARCHIVE DESTINATION lib)
|
||||
|
||||
configure_file(config.h.cmake config.h)
|
||||
|
||||
|
|
@ -27,60 +27,60 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../.git")
|
|||
endif()
|
||||
|
||||
file(GLOB netbuild_sources "netbuild/*.cpp" "netbuild/*.h")
|
||||
set(converter_sources "${converter_sources};${netbuild_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netbuild_sources}")
|
||||
|
||||
file(GLOB netimport_sources "netimport/*.cpp" "netimport/*.h")
|
||||
set(converter_sources "${converter_sources};${netimport_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netimport_sources}")
|
||||
|
||||
file(GLOB netimport_vissim_sources "netimport/vissim/*.cpp" "netimport/vissim/*.h")
|
||||
set(converter_sources "${converter_sources};${netimport_vissim_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_sources}")
|
||||
|
||||
file(GLOB netimport_vissim_tempstructs_sources "netimport/vissim/tempstructs/*.cpp" "netimport/vissim/tempstructs/*.h")
|
||||
set(converter_sources "${converter_sources};${netimport_vissim_tempstructs_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_tempstructs_sources}")
|
||||
|
||||
file(GLOB netimport_vissim_typeloader_sources "netimport/vissim/typeloader/*.cpp" "netimport/vissim/typeloader/*.h")
|
||||
set(converter_sources "${converter_sources};${netimport_vissim_typeloader_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netimport_vissim_typeloader_sources}")
|
||||
|
||||
file(GLOB netwrite_sources "netwrite/*.cpp" "netwrite/*.h")
|
||||
set(converter_sources "${converter_sources};${netwrite_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${netwrite_sources}")
|
||||
|
||||
file(GLOB foreign_eulerspiral_sources "foreign/eulerspiral/*.cpp" "foreign/eulerspiral/*.h")
|
||||
set(converter_sources "${converter_sources};${foreign_eulerspiral_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${foreign_eulerspiral_sources}")
|
||||
|
||||
file(GLOB foreign_tcpip_sources "foreign/tcpip/*.cpp" "foreign/tcpip/*.h")
|
||||
set(converter_sources "${converter_sources};${foreign_tcpip_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${foreign_tcpip_sources}")
|
||||
|
||||
file(GLOB utils_common_sources "utils/common/*.cpp" "utils/common/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_common_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_common_sources}")
|
||||
|
||||
file(GLOB utils_distribution_sources "utils/distribution/*.cpp" "utils/distribution/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_distribution_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_distribution_sources}")
|
||||
|
||||
file(GLOB utils_shapes_sources "utils/shapes/*.cpp" "utils/shapes/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_shapes_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_shapes_sources}")
|
||||
|
||||
file(GLOB utils_options_sources "utils/options/*.cpp" "utils/options/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_options_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_options_sources}")
|
||||
|
||||
file(GLOB utils_xml_sources "utils/xml/*.cpp" "utils/xml/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_xml_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_xml_sources}")
|
||||
|
||||
file(GLOB utils_geom_sources "utils/geom/*.cpp" "utils/geom/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_geom_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_geom_sources}")
|
||||
|
||||
file(GLOB utils_importio_sources "utils/importio/*.cpp" "utils/importio/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_importio_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_importio_sources}")
|
||||
|
||||
file(GLOB utils_iodevices_sources "utils/iodevices/*.cpp" "utils/iodevices/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_iodevices_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_iodevices_sources}")
|
||||
|
||||
file(GLOB utils_traction_wire_sources "utils/traction_wire/*.cpp" "utils/traction_wire/*.h")
|
||||
set(converter_sources "${converter_sources};${utils_traction_wire_sources}")
|
||||
set(osm2odr_sources "${osm2odr_sources};${utils_traction_wire_sources}")
|
||||
|
||||
add_library(converter STATIC ${converter_sources})
|
||||
target_link_libraries(converter ${XercesC_LIBRARIES} ${ZLIB_LIBRARIES} ${PROJ_LIBRARY})
|
||||
add_library(osm2odr STATIC ${osm2odr_sources})
|
||||
target_link_libraries(osm2odr ${XercesC_LIBRARIES} ${ZLIB_LIBRARIES} ${PROJ_LIBRARY})
|
||||
if (WIN32)
|
||||
target_compile_definitions(converter PUBLIC "XERCES_STATIC_LIBRARY")
|
||||
target_compile_definitions(osm2odr PUBLIC "XERCES_STATIC_LIBRARY")
|
||||
endif ()
|
||||
install(TARGETS converter ARCHIVE DESTINATION lib)
|
||||
install(FILES Converter.h DESTINATION include)
|
||||
install(TARGETS osm2odr ARCHIVE DESTINATION lib)
|
||||
install(FILES OSM2ODR.h DESTINATION include)
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
// This work is licensed under the terms of the MIT license.
|
||||
// For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
#include "Converter.h"
|
||||
#include "OSM2ODR.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue