diff --git a/.DS_Store b/.DS_Store index 5172429..87f44f1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.txt b/.txt index 4a099ef..849df02 100644 --- a/.txt +++ b/.txt @@ -5,13 +5,16 @@ Win: adapter_env\Scripts\activate python3 -m pip install pytest -Mac: +Mac install: python3 -m pip install --user virtualenv python3 -m venv adapter_env source adapter_env/bin/activate pip install pytest pytest +Mac running tests: +source adapter_env/bin/activate +pytest Run tests pytest \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/adapter_env/.DS_Store b/adapter_env/.DS_Store new file mode 100644 index 0000000..3fe4e1f Binary files /dev/null and b/adapter_env/.DS_Store differ diff --git a/adapter_env/bin/Activate.ps1 b/adapter_env/bin/Activate.ps1 index a3bc6fb..2fb3852 100644 --- a/adapter_env/bin/Activate.ps1 +++ b/adapter_env/bin/Activate.ps1 @@ -1,241 +1,241 @@ -<# -.Synopsis -Activate a Python virtual environment for the current PowerShell session. - -.Description -Pushes the python executable for a virtual environment to the front of the -$Env:PATH environment variable and sets the prompt to signify that you are -in a Python virtual environment. Makes use of the command line switches as -well as the `pyvenv.cfg` file values present in the virtual environment. - -.Parameter VenvDir -Path to the directory that contains the virtual environment to activate. The -default value for this is the parent of the directory that the Activate.ps1 -script is located within. - -.Parameter Prompt -The prompt prefix to display when this virtual environment is activated. By -default, this prompt is the name of the virtual environment folder (VenvDir) -surrounded by parentheses and followed by a single space (ie. '(.venv) '). - -.Example -Activate.ps1 -Activates the Python virtual environment that contains the Activate.ps1 script. - -.Example -Activate.ps1 -Verbose -Activates the Python virtual environment that contains the Activate.ps1 script, -and shows extra information about the activation as it executes. - -.Example -Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv -Activates the Python virtual environment located in the specified location. - -.Example -Activate.ps1 -Prompt "MyPython" -Activates the Python virtual environment that contains the Activate.ps1 script, -and prefixes the current prompt with the specified string (surrounded in -parentheses) while the virtual environment is active. - -.Notes -On Windows, it may be required to enable this Activate.ps1 script by setting the -execution policy for the user. You can do this by issuing the following PowerShell -command: - -PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - -For more information on Execution Policies: -https://go.microsoft.com/fwlink/?LinkID=135170 - -#> -Param( - [Parameter(Mandatory = $false)] - [String] - $VenvDir, - [Parameter(Mandatory = $false)] - [String] - $Prompt -) - -<# Function declarations --------------------------------------------------- #> - -<# -.Synopsis -Remove all shell session elements added by the Activate script, including the -addition of the virtual environment's Python executable from the beginning of -the PATH variable. - -.Parameter NonDestructive -If present, do not remove this function from the global namespace for the -session. - -#> -function global:deactivate ([switch]$NonDestructive) { - # Revert to original values - - # The prior prompt: - if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { - Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt - Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT - } - - # The prior PYTHONHOME: - if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { - Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME - Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME - } - - # The prior PATH: - if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { - Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH - Remove-Item -Path Env:_OLD_VIRTUAL_PATH - } - - # Just remove the VIRTUAL_ENV altogether: - if (Test-Path -Path Env:VIRTUAL_ENV) { - Remove-Item -Path env:VIRTUAL_ENV - } - - # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: - if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { - Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force - } - - # Leave deactivate function in the global namespace if requested: - if (-not $NonDestructive) { - Remove-Item -Path function:deactivate - } -} - -<# -.Description -Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the -given folder, and returns them in a map. - -For each line in the pyvenv.cfg file, if that line can be parsed into exactly -two strings separated by `=` (with any amount of whitespace surrounding the =) -then it is considered a `key = value` line. The left hand string is the key, -the right hand is the value. - -If the value starts with a `'` or a `"` then the first and last character is -stripped from the value before being captured. - -.Parameter ConfigDir -Path to the directory that contains the `pyvenv.cfg` file. -#> -function Get-PyVenvConfig( - [String] - $ConfigDir -) { - Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" - - # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). - $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue - - # An empty map will be returned if no config file is found. - $pyvenvConfig = @{ } - - if ($pyvenvConfigPath) { - - Write-Verbose "File exists, parse `key = value` lines" - $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath - - $pyvenvConfigContent | ForEach-Object { - $keyval = $PSItem -split "\s*=\s*", 2 - if ($keyval[0] -and $keyval[1]) { - $val = $keyval[1] - - # Remove extraneous quotations around a string value. - if ("'""".Contains($val.Substring(0, 1))) { - $val = $val.Substring(1, $val.Length - 2) - } - - $pyvenvConfig[$keyval[0]] = $val - Write-Verbose "Adding Key: '$($keyval[0])'='$val'" - } - } - } - return $pyvenvConfig -} - - -<# Begin Activate script --------------------------------------------------- #> - -# Determine the containing directory of this script -$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition -$VenvExecDir = Get-Item -Path $VenvExecPath - -Write-Verbose "Activation script is located in path: '$VenvExecPath'" -Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" -Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" - -# Set values required in priority: CmdLine, ConfigFile, Default -# First, get the location of the virtual environment, it might not be -# VenvExecDir if specified on the command line. -if ($VenvDir) { - Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" -} -else { - Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." - $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") - Write-Verbose "VenvDir=$VenvDir" -} - -# Next, read the `pyvenv.cfg` file to determine any required value such -# as `prompt`. -$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir - -# Next, set the prompt from the command line, or the config file, or -# just use the name of the virtual environment folder. -if ($Prompt) { - Write-Verbose "Prompt specified as argument, using '$Prompt'" -} -else { - Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" - if ($pyvenvCfg -and $pyvenvCfg['prompt']) { - Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" - $Prompt = $pyvenvCfg['prompt']; - } - else { - Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virutal environment)" - Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" - $Prompt = Split-Path -Path $venvDir -Leaf - } -} - -Write-Verbose "Prompt = '$Prompt'" -Write-Verbose "VenvDir='$VenvDir'" - -# Deactivate any currently active virtual environment, but leave the -# deactivate function in place. -deactivate -nondestructive - -# Now set the environment variable VIRTUAL_ENV, used by many tools to determine -# that there is an activated venv. -$env:VIRTUAL_ENV = $VenvDir - -if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { - - Write-Verbose "Setting prompt to '$Prompt'" - - # Set the prompt to include the env name - # Make sure _OLD_VIRTUAL_PROMPT is global - function global:_OLD_VIRTUAL_PROMPT { "" } - Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT - New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt - - function global:prompt { - Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " - _OLD_VIRTUAL_PROMPT - } -} - -# Clear PYTHONHOME -if (Test-Path -Path Env:PYTHONHOME) { - Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME - Remove-Item -Path Env:PYTHONHOME -} - -# Add the venv to the PATH -Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH -$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" +<# +.Synopsis +Activate a Python virtual environment for the current PowerShell session. + +.Description +Pushes the python executable for a virtual environment to the front of the +$Env:PATH environment variable and sets the prompt to signify that you are +in a Python virtual environment. Makes use of the command line switches as +well as the `pyvenv.cfg` file values present in the virtual environment. + +.Parameter VenvDir +Path to the directory that contains the virtual environment to activate. The +default value for this is the parent of the directory that the Activate.ps1 +script is located within. + +.Parameter Prompt +The prompt prefix to display when this virtual environment is activated. By +default, this prompt is the name of the virtual environment folder (VenvDir) +surrounded by parentheses and followed by a single space (ie. '(.venv) '). + +.Example +Activate.ps1 +Activates the Python virtual environment that contains the Activate.ps1 script. + +.Example +Activate.ps1 -Verbose +Activates the Python virtual environment that contains the Activate.ps1 script, +and shows extra information about the activation as it executes. + +.Example +Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv +Activates the Python virtual environment located in the specified location. + +.Example +Activate.ps1 -Prompt "MyPython" +Activates the Python virtual environment that contains the Activate.ps1 script, +and prefixes the current prompt with the specified string (surrounded in +parentheses) while the virtual environment is active. + +.Notes +On Windows, it may be required to enable this Activate.ps1 script by setting the +execution policy for the user. You can do this by issuing the following PowerShell +command: + +PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + +For more information on Execution Policies: +https://go.microsoft.com/fwlink/?LinkID=135170 + +#> +Param( + [Parameter(Mandatory = $false)] + [String] + $VenvDir, + [Parameter(Mandatory = $false)] + [String] + $Prompt +) + +<# Function declarations --------------------------------------------------- #> + +<# +.Synopsis +Remove all shell session elements added by the Activate script, including the +addition of the virtual environment's Python executable from the beginning of +the PATH variable. + +.Parameter NonDestructive +If present, do not remove this function from the global namespace for the +session. + +#> +function global:deactivate ([switch]$NonDestructive) { + # Revert to original values + + # The prior prompt: + if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { + Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt + Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT + } + + # The prior PYTHONHOME: + if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { + Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME + Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME + } + + # The prior PATH: + if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { + Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH + Remove-Item -Path Env:_OLD_VIRTUAL_PATH + } + + # Just remove the VIRTUAL_ENV altogether: + if (Test-Path -Path Env:VIRTUAL_ENV) { + Remove-Item -Path env:VIRTUAL_ENV + } + + # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: + if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { + Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force + } + + # Leave deactivate function in the global namespace if requested: + if (-not $NonDestructive) { + Remove-Item -Path function:deactivate + } +} + +<# +.Description +Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the +given folder, and returns them in a map. + +For each line in the pyvenv.cfg file, if that line can be parsed into exactly +two strings separated by `=` (with any amount of whitespace surrounding the =) +then it is considered a `key = value` line. The left hand string is the key, +the right hand is the value. + +If the value starts with a `'` or a `"` then the first and last character is +stripped from the value before being captured. + +.Parameter ConfigDir +Path to the directory that contains the `pyvenv.cfg` file. +#> +function Get-PyVenvConfig( + [String] + $ConfigDir +) { + Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" + + # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). + $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue + + # An empty map will be returned if no config file is found. + $pyvenvConfig = @{ } + + if ($pyvenvConfigPath) { + + Write-Verbose "File exists, parse `key = value` lines" + $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath + + $pyvenvConfigContent | ForEach-Object { + $keyval = $PSItem -split "\s*=\s*", 2 + if ($keyval[0] -and $keyval[1]) { + $val = $keyval[1] + + # Remove extraneous quotations around a string value. + if ("'""".Contains($val.Substring(0, 1))) { + $val = $val.Substring(1, $val.Length - 2) + } + + $pyvenvConfig[$keyval[0]] = $val + Write-Verbose "Adding Key: '$($keyval[0])'='$val'" + } + } + } + return $pyvenvConfig +} + + +<# Begin Activate script --------------------------------------------------- #> + +# Determine the containing directory of this script +$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition +$VenvExecDir = Get-Item -Path $VenvExecPath + +Write-Verbose "Activation script is located in path: '$VenvExecPath'" +Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" +Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" + +# Set values required in priority: CmdLine, ConfigFile, Default +# First, get the location of the virtual environment, it might not be +# VenvExecDir if specified on the command line. +if ($VenvDir) { + Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" +} +else { + Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." + $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") + Write-Verbose "VenvDir=$VenvDir" +} + +# Next, read the `pyvenv.cfg` file to determine any required value such +# as `prompt`. +$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir + +# Next, set the prompt from the command line, or the config file, or +# just use the name of the virtual environment folder. +if ($Prompt) { + Write-Verbose "Prompt specified as argument, using '$Prompt'" +} +else { + Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" + if ($pyvenvCfg -and $pyvenvCfg['prompt']) { + Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" + $Prompt = $pyvenvCfg['prompt']; + } + else { + Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virutal environment)" + Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" + $Prompt = Split-Path -Path $venvDir -Leaf + } +} + +Write-Verbose "Prompt = '$Prompt'" +Write-Verbose "VenvDir='$VenvDir'" + +# Deactivate any currently active virtual environment, but leave the +# deactivate function in place. +deactivate -nondestructive + +# Now set the environment variable VIRTUAL_ENV, used by many tools to determine +# that there is an activated venv. +$env:VIRTUAL_ENV = $VenvDir + +if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { + + Write-Verbose "Setting prompt to '$Prompt'" + + # Set the prompt to include the env name + # Make sure _OLD_VIRTUAL_PROMPT is global + function global:_OLD_VIRTUAL_PROMPT { "" } + Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT + New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt + + function global:prompt { + Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " + _OLD_VIRTUAL_PROMPT + } +} + +# Clear PYTHONHOME +if (Test-Path -Path Env:PYTHONHOME) { + Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME + Remove-Item -Path Env:PYTHONHOME +} + +# Add the venv to the PATH +Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH +$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" diff --git a/adapter_env/bin/pip b/adapter_env/bin/pip old mode 100644 new mode 100755 diff --git a/adapter_env/bin/pip3 b/adapter_env/bin/pip3 old mode 100644 new mode 100755 diff --git a/adapter_env/bin/pip3.9 b/adapter_env/bin/pip3.9 old mode 100644 new mode 100755 diff --git a/adapter_env/bin/py.test b/adapter_env/bin/py.test old mode 100644 new mode 100755 diff --git a/adapter_env/bin/pytest b/adapter_env/bin/pytest old mode 100644 new mode 100755 diff --git a/adapter_env/bin/python3.9 b/adapter_env/bin/python3.9 old mode 100644 new mode 100755 index 9c670a4..06af448 Binary files a/adapter_env/bin/python3.9 and b/adapter_env/bin/python3.9 differ diff --git a/src/.DS_Store b/src/.DS_Store index 03c0afb..e50e3e6 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/Example_JSON b/src/Example_JSON.json similarity index 100% rename from src/Example_JSON rename to src/Example_JSON.json diff --git a/src/__pycache__/adapter.cpython-39.pyc b/src/__pycache__/adapter.cpython-39.pyc new file mode 100644 index 0000000..deebd21 Binary files /dev/null and b/src/__pycache__/adapter.cpython-39.pyc differ diff --git a/src/__pytest__/.DS_Store b/src/__pytest__/.DS_Store index 8e1736d..755f021 100644 Binary files a/src/__pytest__/.DS_Store and b/src/__pytest__/.DS_Store differ diff --git a/src/__pytest__/__pycache__/conftest.cpython-39-pytest-6.2.5.pyc b/src/__pytest__/__pycache__/conftest.cpython-39-pytest-6.2.5.pyc new file mode 100644 index 0000000..2f34a7c Binary files /dev/null and b/src/__pytest__/__pycache__/conftest.cpython-39-pytest-6.2.5.pyc differ diff --git a/src/__pytest__/conftest.py b/src/__pytest__/conftest.py index fe39697..2d7eb70 100644 --- a/src/__pytest__/conftest.py +++ b/src/__pytest__/conftest.py @@ -25,24 +25,24 @@ def fake_mapdata_node_1(): return [ { "node_id": 0, + "lon": 40, + "lat": 50 + }, + { + "node_id": 1, "lon": 41, "lat": 51 }, { - "node_id": 1, + "node_id": 2, "lon": 42, "lat": 52 }, { - "node_id": 2, + "node_id": 3, "lon": 43, "lat": 53 }, - { - "node_id": 3, - "lon": 44, - "lat": 54 - }, ] @pytest.fixture @@ -55,173 +55,414 @@ def fake_mapdata_edge_1(): "edge_id": 0, "edge_basenode": 0, "distance": 100, - "edge_name": "Eksempel Gade", - "highway": True, + "edge_name": "Eksempel Gade A", + "highway": "highway", "maxspeed": 130, "edge_adj": 1, }, { "edge_id": 1, "edge_basenode": 1, - "distance": 100, - "edge_name": "Eksempel Gade", - "highway": True, - "maxspeed": 130, - "edge_adj": 0, - }, - { - "edge_id": 2, - "edge_basenode": 1, "distance": 200, - "edge_name": "Eksempel Gade", - "highway": False, + "edge_name": "Eksempel Gade B", + "highway": "residential", "maxspeed": 80, "edge_adj": 2, }, { - "edge_id": 3, - "edge_basenode": 2, - "distance": 200, - "edge_name": "Eksempel Gade", - "highway": False, - "maxspeed": 80, - "edge_adj": 1, - }, - { - "edge_id": 4, + "edge_id": 2, "edge_basenode": 2, "distance": 300, - "edge_name": "Eksempel Gade", - "highway": False, + "edge_name": "Eksempel Gade C", + "highway": "city", "maxspeed": 50, "edge_adj": 3, }, { - "edge_id": 5, + "edge_id": 3, "edge_basenode": 3, "distance": 300, - "edge_name": "Eksempel Gade", - "highway": False, + "edge_name": "Eksempel Gade C", + "highway": "city", "maxspeed": 50, "edge_adj": 2, }, + { + "edge_id": 4, + "edge_basenode": 2, + "distance": 200, + "edge_name": "Eksempel Gade B", + "highway": "residential", + "maxspeed": 80, + "edge_adj": 1, + }, + { + "edge_id": 5, + "edge_basenode": 1, + "distance": 100, + "edge_name": "Eksempel Gade A", + "highway": "highway", + "maxspeed": 130, + "edge_adj": 0, + }, + #edge.from_node_id = row["edge_basenode"]#TODO: RFC navneændring + ] + @pytest.fixture def fake_expected_model_1(): return { "error_list": [], "meta_data": { "last_service": "Creator", - "priority": None, + "priority": 0, }, "vehicle":{ - + "id":0, + "data":{} }, "nodes": [ { "node_id": 0, - "node_weight": 1, + "node_weight": 0, + "data":{ + "longitude": 40, + "latitude": 50, + }, + "edges": [ + { + "edge_id": 0, + "to_node_id": 1, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade A", + "distance": 100, + "max_speed": 130, + "road_type": "highway" + }, + }, + ], + }, + { + "node_id": 1, + "node_weight": 0, "data":{ "longitude": 41, "latitude": 51, }, "edges": [ { + "edge_id": 1, + "to_node_id": 2, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade B", + "distance": 200, + "max_speed": 80, + "road_type": "residential" + + }, + }, + { + "edge_id": 5, "to_node_id": 0, - "weight": 1, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": True, + "road_name": "Eksempel Gade A", "distance": 100, - "max_speed": 130 + "max_speed": 130, + "road_type": "highway" + }, }, + ], }, { - "node_id": 1, - "node_weight": 1, + "node_id": 2, + "node_weight": 0, "data":{ "longitude": 42, "latitude": 52, }, "edges": [ { - "to_node_id": 0, - "weight": 1, + "edge_id": 2, + "to_node_id": 3, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": True, + "road_name": "Eksempel Gade C", "distance": 300, - "max_speed": 130 + "max_speed": 50, + "road_type": "city" + }, }, { - "to_node_id": 2, - "weight": 1, + "edge_id": 4, + "to_node_id": 1, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": False, + "road_name": "Eksempel Gade B", "distance": 200, - "max_speed": 80 + "max_speed": 80, + "road_type": "residential" + }, }, + ], }, { - "node_id": 2, - "node_weight": 1, + "node_id": 3, + "node_weight": 0, "data":{ "longitude": 43, "latitude": 53, }, "edges": [ { + "edge_id": 3, + "to_node_id": 2, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade C", + "distance": 300, + "max_speed": 50, + "road_type": "city" + + }, + }, + ], + }, + ] + } + +""" + FIXTURE GROUPING 2: Star junction, a graph with 4 nodes connected in a star junction +""" + +@pytest.fixture +def fake_mapdata_node_2(): + """ + + """ + return [ + { + "node_id": 0, + "lon": 40, + "lat": 50 + }, + { + "node_id": 1, + "lon": 41, + "lat": 51 + }, + { + "node_id": 2, + "lon": 42, + "lat": 52 + }, + { + "node_id": 3, + "lon": 43, + "lat": 53 + }, + ] + +@pytest.fixture +def fake_mapdata_edge_2(): + """ + Edges making a star from node 0 to 1,2,3 in fake_mapdata_node and back, with distance increasing by 100 each time + """ + return [ + { + "edge_id": 0, + "edge_basenode": 0, + "distance": 100, + "edge_name": "Eksempel Gade A", + "highway": "highway", + "maxspeed": 130, + "edge_adj": 1, + }, + { + "edge_id": 1, + "edge_basenode": 0, + "distance": 200, + "edge_name": "Eksempel Gade B", + "highway": "residential", + "maxspeed": 80, + "edge_adj": 2, + }, + { + "edge_id": 2, + "edge_basenode": 0, + "distance": 300, + "edge_name": "Eksempel Gade C", + "highway": "city", + "maxspeed": 50, + "edge_adj": 3, + }, + { + "edge_id": 3, + "edge_basenode": 3, + "distance": 300, + "edge_name": "Eksempel Gade C", + "highway": "city", + "maxspeed": 50, + "edge_adj": 0, + }, + { + "edge_id": 4, + "edge_basenode": 2, + "distance": 200, + "edge_name": "Eksempel Gade B", + "highway": "residential", + "maxspeed": 80, + "edge_adj": 0, + }, + { + "edge_id": 5, + "edge_basenode": 1, + "distance": 100, + "edge_name": "Eksempel Gade A", + "highway": "highway", + "maxspeed": 130, + "edge_adj": 0, + }, + #edge.from_node_id = row["edge_basenode"]#TODO: RFC navneændring + + ] + + +@pytest.fixture +def fake_expected_model_2(): + return { + "error_list": [], + "meta_data": { + "last_service": "Creator", + "priority": 0, + }, + "vehicle":{ + "id":0, + "data":{} + }, + "nodes": [ + { + "node_id": 0, + "node_weight": 0, + "data":{ + "longitude": 40, + "latitude": 50, + }, + "edges": [ + { + "edge_id": 0, "to_node_id": 1, - "weight": 1, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade A", + "distance": 100, + "max_speed": 130, + "road_type": "highway" + }, + }, + { + "edge_id": 1, + "to_node_id": 2, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": False, + "road_name": "Eksempel Gade B", "distance": 200, - "max_speed": 80 + "max_speed": 80, + "road_type": "residential" + }, }, { + "edge_id": 2, "to_node_id": 3, - "weight": 1, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": False, + "road_name": "Eksempel Gade C", "distance": 300, - "max_speed": 50 + "max_speed": 50, + "road_type": "city" + }, }, ], }, + { + "node_id": 1, + "node_weight": 0, + "data":{ + "longitude": 41, + "latitude": 51, + }, + "edges": [ + + { + "edge_id": 5, + "to_node_id": 0, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade A", + "distance": 100, + "max_speed": 130, + "road_type": "highway" + + }, + }, + + ], + }, + { + "node_id": 2, + "node_weight": 0, + "data":{ + "longitude": 42, + "latitude": 52, + }, + "edges": [ + + { + "edge_id": 4, + "to_node_id": 0, + "edge_weight": 0, + "data":{ + "road_name": "Eksempel Gade B", + "distance": 200, + "max_speed": 80, + "road_type": "residential" + + }, + }, + + ], + }, { "node_id": 3, - "node_weight": 1, + "node_weight": 0, "data":{ - "longitude": 44, - "latitude": 54, + "longitude": 43, + "latitude": 53, }, "edges": [ { - "to_node_id": 2, - "weight": 1, + "edge_id": 3, + "to_node_id": 0, + "edge_weight": 0, "data":{ - "name": "Eksempel Gade", - "highway": False, + "road_name": "Eksempel Gade C", "distance": 300, - "max_speed": 50 + "max_speed": 50, + "road_type": "city" + }, }, ], }, - ] - } - -""" - FIXTURE GROUPING 2: Not Defined Yet -""" \ No newline at end of file + ] + } \ No newline at end of file diff --git a/src/__pytest__/test_adapter.py b/src/__pytest__/test_adapter.py index 4024297..d663518 100644 --- a/src/__pytest__/test_adapter.py +++ b/src/__pytest__/test_adapter.py @@ -24,4 +24,14 @@ def test_adapter_to_json_serializes_grouping_1_to_traffic_model_schema(fake_mapd edges=fake_mapdata_edge_1 ) - assert fake_expected_model_1 == json.loads(serialized_model) \ No newline at end of file + assert fake_expected_model_1 == json.loads(serialized_model) + +# def test_adapter_to_json_serializes_grouping_2_to_traffic_model_schema(fake_mapdata_node_2, fake_mapdata_edge_2, fake_expected_model_2): +# adapter = Adapter() + +# serialized_model_2 = adapter.to_json( +# nodes=fake_mapdata_node_2, +# edges=fake_mapdata_edge_2 +# ) + +# assert fake_expected_model_2 == json.loads(serialized_model_2) \ No newline at end of file diff --git a/src/adapter.py b/src/adapter.py index d70678e..7c1e962 100644 --- a/src/adapter.py +++ b/src/adapter.py @@ -34,21 +34,21 @@ def to_json(self, **table_kwargs): In this Creator service, it converts data from the Database to the initial JSON schema following the TNM. """ dataModel = DataModel - nodesJSON = table_kwargs["nodes"] - dataModel.errorList = table_kwargs["errors"] - dataModel.metadata = table_kwargs["metadata"] - dataModel.vehicle = table_kwargs["vehicle"] + #nodesJSON = table_kwargs["nodes"] + # dataModel.errorList = table_kwargs["errors"] + # dataModel.metadata = table_kwargs["metadata"] + # dataModel.vehicle = table_kwargs["vehicle"] #Add nodes to dataModel for row in table_kwargs["nodes"]: node=makeNode(row) - dataModel.nodes.insert(node.node_id, node)#add node at its node_id + dataModel["nodes"].insert(node["node_id"], node)#add node at its node_id #Add edges to nodes in dataModel for row in table_kwargs["edges"]: edge = makeEdge(row) from_node_id = row["edge_basenode"] - dataModel.nodes[from_node_id].edges.insert(edge.edge_id,edge)#the from_node_id is used to position an edge at its origining node, and the edge, using this alternative can remove edge.from_node_id from makeEdge + dataModel["nodes"][from_node_id]["edges"].insert(edge["edge_id"],edge)#the from_node_id is used to position an edge at its origining node, and the edge, using this alternative can remove edge.from_node_id from makeEdge serialized_data = json.dumps(dataModel) return serialized_data @@ -57,21 +57,24 @@ def to_json(self, **table_kwargs): def makeNode(row): node ={} - node.node_id = row["node_id"] - node.node_weight = row["node_weight"] - node.edges = [] - node.data = { + node["node_id"]= row["node_id"] + node["node_weight"]= 0 + node["data"]= { "longitude" : row["lon"], "latitude" : row["lat"] } + node["edges"]= [] + return node def makeEdge(row): edge = {} - edge.edge_id= row["edge_id"] - edge.to_node_id = row["edge_adj"] #TODO: RFC navneændring - #edge.from_node_id = row["edge_basenode"]#TODO: RFC navneændring - edge.Data={ + edge["edge_id"]= row["edge_id"] + edge["to_node_id"]= row["edge_adj"] #TODO: RFC navneændring + edge["edge_weight"]= 0 + + #edge[from_node_id ]= row["edge_basenode"]#TODO: RFC navneændring + edge["data"]={ "distance" : row["distance"], "road_name" : row["edge_name"], "road_type" : row["highway"],#UNDEFINED