Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BREAKING] X/Y input via geofabrik .json + only support processing maps via geofabrik .json, delete wahoomc/resources/json/ files, constants and related coding #183

Merged
merged 16 commits into from
Mar 9, 2023
Merged

[BREAKING] X/Y input via geofabrik .json + only support processing maps via geofabrik .json, delete wahoomc/resources/json/ files, constants and related coding #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3f786d5
only read geofabrik file once + make "global" variable
treee111 Feb 13, 2023
b32ad22
x/y coordinates working solution
treee111 Feb 13, 2023
33d6799
unittest
treee111 Feb 14, 2023
5079b58
translate to and set geofabrik id_no if found
treee111 Feb 19, 2023
609c95d
Merge branch 'release-v4.0.0' into geofabrik-xy-3
treee111 Feb 20, 2023
deeb39e
reduce complexity
treee111 Feb 13, 2023
f7b5bbc
mode in Geofabrik class, get unittests to work again
treee111 Feb 20, 2023
621b79f
Geofabrik as interface and two classes
treee111 Feb 20, 2023
b0cef2e
cut geofabrik.py into functions, detailled unittests
treee111 Feb 21, 2023
14ddb4e
pylint and vulture findings + delete one dir more
treee111 Feb 21, 2023
77c752f
delete existing .json files implementation + unittests for retrieving…
treee111 Feb 22, 2023
1d9b5d3
remove geofabrik_tiles input argument
treee111 Feb 22, 2023
5d7d019
clean up launch configuration, comments
treee111 Feb 22, 2023
90b8657
PR review findings
treee111 Feb 22, 2023
1175a14
files of unittest run on macOS for malta 2. tile (geofabrik)
treee111 Feb 27, 2023
1d6a1f3
Merge branch 'release-v4.0.0' into geofabrik-xy
treee111 Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
79 changes: 45 additions & 34 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "0.2.0",
"configurations": [
{
"name": "x/y: 134/88 (STG)",
"name": "x/y: 134/88 (stuttgart)",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand Down Expand Up @@ -34,7 +34,7 @@
]
},
{
"name": "germany",
"name": "co: germany",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand All @@ -46,7 +46,7 @@
]
},
{
"name": "malta (no POI)",
"name": "co: malta (no POI)",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand All @@ -64,26 +64,7 @@
]
},
{
"name": "malta-geofabrik (no POI)",
"type": "python",
"request": "launch",
"module": "wahoomc",
"console": "integratedTerminal",
"args": [
"cli",
"-co",
"malta",
"-tag",
"tag-wahoo.xml",
"-fp",
"-c",
"-md",
"100",
"-gt"
]
},
{
"name": "malta -c NO -fp",
"name": "co: malta NO -fp",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand All @@ -98,23 +79,23 @@
]
},
{
"name": "malta",
"name": "x/y: 138/100 (malta)",
"type": "python",
"request": "launch",
"module": "wahoomc",
"console": "integratedTerminal",
"args": [
"cli",
"-co",
"malta",
"-xy",
"138/100",
"-fp",
"-c",
"-md",
"100"
]
},
{
"name": "x/y: 135/91 (Garda) #160",
"name": "x/y: 135/91 (gardasee) #160",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand Down Expand Up @@ -166,25 +147,56 @@
"args": [
"cli",
"-xy",
"133/88"
"133/88",
"-c"
]
},
{
"name": "x/y: 138/100 (malta) -c",
"name": "x/y: 134/89 (bodensee 4 countries)",
"type": "python",
"request": "launch",
"module": "wahoomc",
"console": "integratedTerminal",
"args": [
"cli",
"-xy",
"138/100",
"134/89",
"-c"
]
},
{
"name": "x/y: 72/98 (virginia)",
"type": "python",
"request": "launch",
"module": "wahoomc",
"console": "integratedTerminal",
"args": [
"cli",
"-xy",
"72/98",
"-fp",
"-c",
"-md",
"100"
]
},
{
"name": "co: virginia -nbc",
"type": "python",
"request": "launch",
"module": "wahoomc",
"console": "integratedTerminal",
"args": [
"cli",
"-co",
"virginia",
"-fp",
"-c",
"-md",
"100",
"-nbc"
]
},
{
"name": "x/y: stg->gardasee (ten tiles)",
"type": "python",
Expand All @@ -198,7 +210,7 @@
]
},
{
"name": "mexico #113",
"name": "co: mexico #113",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand All @@ -212,7 +224,7 @@
]
},
{
"name": "solomon_islands geofabrik",
"name": "co: solomon_islands",
"type": "python",
"request": "launch",
"module": "wahoomc",
Expand All @@ -223,8 +235,7 @@
"solomon_islands",
"-c",
"-md",
"100",
"-gt"
"100"
]
}
]
Expand Down
Binary file added tests/resources/macos/137/100.map
View file
Open in desktop
Binary file not shown.
Binary file added tests/resources/macos/137/100.map.lzma
View file
Open in desktop
Binary file not shown.
Empty file added tests/resources/macos/137/100.map.lzma.17
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions tests/resources/macos/137/100/land.prj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
Binary file added tests/resources/macos/137/100/land.shp
View file
Open in desktop
Binary file not shown.
Binary file added tests/resources/macos/137/100/land.shx
View file
Open in desktop
Binary file not shown.
Loading