Skip to content

Commit

Permalink
Merge pull request #345 from cevi/dev
Browse files Browse the repository at this point in the history
Version 4.0.2 - Update dependencies & Bug Fix

- Update Dependencies
- Fix GET/POST Bug, thanks @johannschwabe !
  • Loading branch information
wp99cp authored May 5, 2024
2 parents 2c2225f + aebb36e commit c49d621
Show file tree
Hide file tree
Showing 12 changed files with 2,404 additions and 1,606 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- uses: actions/setup-node@v4.0.1
- uses: actions/setup-node@v4.0.2
with:
node-version: '16'

Expand Down
12 changes: 6 additions & 6 deletions backend/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ def create_walk_time_table():
# calc POIs for the path
pois_transformer = POIsTransformer(
pois_list_as_str=options["pois"] if "pois" in options else "",
pois_distance_str=options["pois_distance"]
if "pois_distance" in options
else "",
pois_distance_str=(
options["pois_distance"] if "pois_distance" in options else ""
),
)
pois: Path = pois_transformer.transform(path)

Expand Down Expand Up @@ -270,9 +270,9 @@ def create_export(options, uuid):
# calc POIs for the path
pois_transformer = POIsTransformer(
pois_list_as_str=options["pois"] if "pois" in options else "",
pois_distance_str=options["pois_distance"]
if "pois_distance" in options
else "",
pois_distance_str=(
options["pois_distance"] if "pois_distance" in options else ""
),
)
pois: Path = pois_transformer.transform(path)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,19 @@ def transform(self, path_: Path) -> Path:
}

coord_type = path_.way_points[0].point.type

params = {
"geom": json.dumps(geom_data),
"nb_points": max(path_.number_of_waypoints, self.min_number_of_points),
"distinct_points": True,
"smart_filling": True,
"sr": coord_type,
}
r = requests.post(
self.PATH_URL,
headers={"Content-Type": "application/json"},
data=json.dumps(geom_data),
params=params,
)

r = requests.get(self.PATH_URL, params=params)
self.__logger.info(r.url)

self.__logger.debug(
Expand Down
10 changes: 5 additions & 5 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Flask==3.0.0
Flask==3.0.3
gunicorn==21.2.0
flask-cors==4.0.0
gpxpy==1.6.2
numpy==1.26.2
numpy==1.26.4
geopy==2.4.1
openpyxl==3.1.2
matplotlib==3.8.2
matplotlib==3.8.4
grequests==0.7.0
pyclustering==0.10.1.2
polyline==2.0.1
pypdf==3.17.3
polyline==2.0.2
pypdf==4.2.0
1,428 changes: 528 additions & 900 deletions docs/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"author": "Cyrill Püntener",
"dependencies": {
"vitepress": "^1.0.0-rc.31",
"vitepress": "^1.1.4",
"vue": "^3.3.13"
}
}
4 changes: 2 additions & 2 deletions e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cypress/included:12.9.0
FROM cypress/included:13.8.1

WORKDIR /opt

Expand All @@ -10,4 +10,4 @@ COPY package-lock.json .
RUN npm ci

WORKDIR /opt/e2e
RUN npx cypress verify
RUN npx cypress verify
16 changes: 8 additions & 8 deletions e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"cypress-xpath": "^2.0.1"
},
"dependencies": {
"dotenv": "^16.3.1"
"dotenv": "^16.4.5"
}
}
Loading

0 comments on commit c49d621

Please sign in to comment.