dragonpilot beta3

date: 2023-10-09T10:55:55
commit: 91b6e3aecd7170f24bccacb10c515ec281c30295

selfdrive/mapd/lib/NodesData.py

@@ -1,6 +1,6 @@
 import numpy as np
 from enum import Enum
-from selfdrive.mapd.lib.geo import DIRECTION, R, vectors
+from openpilot.selfdrive.mapd.lib.geo import DIRECTION, R, vectors
 
 from scipy.interpolate import splev, splprep  
 

selfdrive/mapd/lib/Route.py

@@ -1,6 +1,6 @@
-from selfdrive.mapd.lib.NodesData import NodesData, NodeDataIdx
-from selfdrive.mapd.config import QUERY_RADIUS
-from selfdrive.mapd.lib.geo import ref_vectors, R, distance_to_points
+from openpilot.selfdrive.mapd.lib.NodesData import NodesData, NodeDataIdx
+from openpilot.selfdrive.mapd.config import QUERY_RADIUS
+from openpilot.selfdrive.mapd.lib.geo import ref_vectors, R, distance_to_points
 from itertools import compress
 import numpy as np
 

selfdrive/mapd/lib/WayCollection.py

@@ -1,7 +1,7 @@
-from selfdrive.mapd.lib.WayRelation import WayRelation
-from selfdrive.mapd.lib.WayRelationIndex import WayRelationIndex
-from selfdrive.mapd.lib.Route import Route
-from selfdrive.mapd.config import LANE_WIDTH
+from openpilot.selfdrive.mapd.lib.WayRelation import WayRelation
+from openpilot.selfdrive.mapd.lib.WayRelationIndex import WayRelationIndex
+from openpilot.selfdrive.mapd.lib.Route import Route
+from openpilot.selfdrive.mapd.config import LANE_WIDTH
 import uuid
 
 

selfdrive/mapd/lib/WayRelation.py

@@ -1,8 +1,8 @@
-from selfdrive.mapd.lib.geo import DIRECTION, R, vectors, bearing_to_points, distance_to_points
-from selfdrive.mapd.lib.osm import create_way
-from common.conversions import Conversions as CV
-from selfdrive.mapd.config import LANE_WIDTH
-from common.basedir import BASEDIR
+from openpilot.selfdrive.mapd.lib.geo import DIRECTION, R, vectors, bearing_to_points, distance_to_points
+from openpilot.selfdrive.mapd.lib.osm import create_way
+from openpilot.common.conversions import Conversions as CV
+from openpilot.selfdrive.mapd.config import LANE_WIDTH
+from openpilot.common.basedir import BASEDIR
 from datetime import datetime as dt
 import numpy as np
 import re

selfdrive/mapd/lib/osm.py

@@ -1,6 +1,6 @@
 import overpy
 import numpy as np
-from selfdrive.mapd.lib.geo import R
+from openpilot.selfdrive.mapd.lib.geo import R
 
 
 def create_way(way_id, node_ids, from_way):

selfdrive/mapd/mapd.py

@@ -4,12 +4,12 @@ from traceback import print_exception
 import numpy as np
 from time import strftime, gmtime
 import cereal.messaging as messaging
-from common.realtime import Ratekeeper
-from selfdrive.mapd.lib.osm import OSM
-from selfdrive.mapd.lib.geo import distance_to_points
-from selfdrive.mapd.lib.WayCollection import WayCollection
-from selfdrive.mapd.config import QUERY_RADIUS, MIN_DISTANCE_FOR_NEW_QUERY, FULL_STOP_MAX_SPEED, LOOK_AHEAD_HORIZON_TIME
-from system.swaglog import cloudlog
+from openpilot.common.realtime import Ratekeeper
+from openpilot.selfdrive.mapd.lib.osm import OSM
+from openpilot.selfdrive.mapd.lib.geo import distance_to_points
+from openpilot.selfdrive.mapd.lib.WayCollection import WayCollection
+from openpilot.selfdrive.mapd.config import QUERY_RADIUS, MIN_DISTANCE_FOR_NEW_QUERY, FULL_STOP_MAX_SPEED, LOOK_AHEAD_HORIZON_TIME
+from openpilot.system.swaglog import cloudlog
 
 
 _DEBUG = False

selfdrive/mapd/test/mock_data.py

@@ -1,6 +1,6 @@
-from selfdrive.mapd.lib.WayCollection import WayCollection
-from selfdrive.mapd.lib.geo import vectors, R
-from selfdrive.mapd.lib.NodesData import _MIN_NODE_DISTANCE, _ADDED_NODES_DIST, _SPLINE_EVAL_STEP, \
+from openpilot.selfdrive.mapd.lib.WayCollection import WayCollection
+from openpilot.selfdrive.mapd.lib.geo import vectors, R
+from openpilot.selfdrive.mapd.lib.NodesData import _MIN_NODE_DISTANCE, _ADDED_NODES_DIST, _SPLINE_EVAL_STEP, \
   _MIN_SPEED_SECTION_LENGTH, nodes_raw_data_array_for_wr, node_calculations, is_wr_a_valid_divertion_from_node, \
   spline_curvature_calculations, speed_limits_for_curvatures_data
 from scipy.interpolate import splev, splprep

selfdrive/mapd/test/test_NodesData.py

@@ -1,13 +1,13 @@
 import unittest
 import numpy as np
-from selfdrive.mapd.lib.geo import DIRECTION
-from common.conversions import Conversions as CV
-from selfdrive.mapd.lib.WayRelation import WayRelation
-from selfdrive.mapd.lib.NodesData import nodes_raw_data_array_for_wr, node_calculations, \
+from openpilot.selfdrive.mapd.lib.geo import DIRECTION
+from openpilot.common.conversions import Conversions as CV
+from openpilot.selfdrive.mapd.lib.WayRelation import WayRelation
+from openpilot.selfdrive.mapd.lib.NodesData import nodes_raw_data_array_for_wr, node_calculations, \
   spline_curvature_calculations, split_speed_section_by_sign, split_speed_section_by_curv_degree, speed_section, \
   speed_limits_for_curvatures_data, is_wr_a_valid_divertion_from_node, SpeedLimitSection, TurnSpeedLimitSection, \
   NodesData, NodeDataIdx
-from selfdrive.mapd.test.mock_data import mockOSMWay_01_01_LongCurvy, mockNodesData01, mockCurveSectionSin, \
+from openpilot.selfdrive.mapd.test.mock_data import mockOSMWay_01_01_LongCurvy, mockNodesData01, mockCurveSectionSin, \
   mockCurveSteepCurvChange, mockCurveSteepCurvChangeShort, mockCurveSmoothCurveChange, \
   mockOSMWay_02_01_CurvyTownWithIntersections, mockOSMWay_02_02_Divertion_34785115, mockOSMWay_02_03_Short_3_node_way, \
   mockRouteData_02_01, mockRouteData_02_02_single_wr, mockRouteData_02_03
@@ -200,7 +200,7 @@ class TestNodesData(unittest.TestCase):
     nd = NodesData(way_relations, wr_index)
 
     assert_array_almost_equal(nd._nodes_data, mockRouteData_02_02_single_wr._nodes_data)
-    assert_array_almost_equal(nd._curvature_speed_sections_data, 
+    assert_array_almost_equal(nd._curvature_speed_sections_data,
                               mockRouteData_02_02_single_wr._curvature_speed_sections_data)
     self.assertListEqual(nd._divertions, mockRouteData_02_02_single_wr._divertions)
     self.assertEqual(len(nd._nodes_data), len(way_relations[0].way.nodes))

selfdrive/mapd/test/test_WayRelation.py

@@ -4,12 +4,12 @@ import numpy as np
 from unittest import mock
 from numpy.testing import assert_array_almost_equal
 from datetime import datetime as dt, timezone, timedelta
-from common.conversions import Conversions as CV
-from selfdrive.mapd.lib.WayRelation import WayRelation, is_osm_time_condition_active, \
+from openpilot.common.conversions import Conversions as CV
+from openpilot.selfdrive.mapd.lib.WayRelation import WayRelation, is_osm_time_condition_active, \
   conditional_speed_limit_for_osm_tag_limit_string, speed_limit_for_osm_tag_limit_string
-from selfdrive.mapd.config import LANE_WIDTH
-from selfdrive.mapd.lib.geo import DIRECTION, R, vectors
-from selfdrive.mapd.test.mock_data import mockOSMWay_01_01_LongCurvy, mockOSMWay_01_02_Loop, \
+from openpilot.selfdrive.mapd.config import LANE_WIDTH
+from openpilot.selfdrive.mapd.lib.geo import DIRECTION, R, vectors
+from openpilot.selfdrive.mapd.test.mock_data import mockOSMWay_01_01_LongCurvy, mockOSMWay_01_02_Loop, \
   mockOSMWay_02_01_CurvyTownWithIntersections
 
 

selfdrive/mapd/test/test_WayRelationIndex.py

@@ -1,6 +1,6 @@
 import unittest
-from selfdrive.mapd.lib.WayRelationIndex import WayRelationIndex
-from selfdrive.mapd.test.mock_data import mockWayCollection01
+from openpilot.selfdrive.mapd.lib.WayRelationIndex import WayRelationIndex
+from openpilot.selfdrive.mapd.test.mock_data import mockWayCollection01
 
 
 class TestWayRelationIndex(unittest.TestCase):

selfdrive/mapd/test/test_geo.py

@@ -1,8 +1,8 @@
 import unittest
-from selfdrive.mapd.lib.geo import vectors, ref_vectors, bearing_to_points, distance_to_points
+from openpilot.selfdrive.mapd.lib.geo import vectors, ref_vectors, bearing_to_points, distance_to_points
 import numpy as np
 from numpy.testing import assert_array_almost_equal
-from selfdrive.mapd.test.mock_data import mockNodesData01
+from openpilot.selfdrive.mapd.test.mock_data import mockNodesData01
 
 
 class TestMapsdGeoLibrary(unittest.TestCase):