diff --git a/CHANGELOG.md b/CHANGELOG.md index 83926f54..137f53ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,14 +34,25 @@ RELEASING: 8. Commit changes with `git commit -m 'chore: release vX.X.X'` 9. Tag the commit `git tag -a vX.X.X -m "vX.X.X"` 10. Push release commit and tag 'git push && git push origin vX.X.X' -11. In repository root generate the plugin package: `zip -r ORStools-vX.X.X.zip ORStools -x "*__pycache__*"` -12. Upload the package to https://plugins.qgis.org/plugins/ORStools/ (Manage > Add Version) -13. Create new release in GitHub with tag version and release title of `vX.X.X` +11. Make sure that your branch is up to date with 'origin/main' and there are no unstaged changes +12. In repository root generate the plugin package: `zip -r ORStools-vX.X.X.zip ORStools -x "*__pycache__*" "*.ruff_cache*"` +13. Upload the package to https://plugins.qgis.org/plugins/ORStools/ (Manage > Add Version) +14. Create new release in GitHub with tag version and release title of `vX.X.X` --> # Unreleased - Make vertex marker on map drag and droppable, add live preview ([#204](https://github.com/GIScience/orstools-qgis-plugin/issues/204)) +## [1.7.1] - 2024-01-15 + +### Added +- Add hint to use batch jobs for point layers in tooltip in save vertices button ([#211](https://github.com/GIScience/orstools-qgis-plugin/issues/211)) + +### Fixed +- TypeError if no SVGPaths are set ([#212](https://github.com/GIScience/orstools-qgis-plugin/issues/212)) +- replace removesuffix() function with replace() function in base processing algorithm ([#215](https://github.com/GIScience/orstools-qgis-plugin/pull/215)) +- Replace line style with style from QGIS v3.16 to enable correct rendering in older versions ([#218](https://github.com/GIScience/orstools-qgis-plugin/issues/218)) + ## [1.7.0] - 2023-12-22 ### Added @@ -212,7 +223,8 @@ RELEASING: - first working version of ORS Tools, after replacing OSM Tools plugin -[unreleased]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.7.0...HEAD +[unreleased]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.7.1...HEAD +[1.7.1]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.7.0...v1.7.1 [1.7.0]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.6.0...v1.7.0 [1.6.0]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.5.3...v1.6.0 [1.5.3]: https://github.com/GIScience/orstools-qgis-plugin/compare/v1.5.2...v1.5.3 diff --git a/ORStools/gui/ORStoolsDialog.py b/ORStools/gui/ORStoolsDialog.py index b92b4a5c..bd6c45ea 100644 --- a/ORStools/gui/ORStoolsDialog.py +++ b/ORStools/gui/ORStoolsDialog.py @@ -258,7 +258,7 @@ def run_gui_control(self): # add ors svg path my_new_path = os.path.join(basepath, "img/svg") - svg_paths = QSettings().value("svg/searchPathsForSVG") + svg_paths = QSettings().value("svg/searchPathsForSVG") or [] if my_new_path not in svg_paths: svg_paths.append(my_new_path) QSettings().setValue("svg/searchPathsForSVG", svg_paths) diff --git a/ORStools/gui/ORStoolsDialogUI.py b/ORStools/gui/ORStoolsDialogUI.py index d25956f7..f2930e1f 100644 --- a/ORStools/gui/ORStoolsDialogUI.py +++ b/ORStools/gui/ORStoolsDialogUI.py @@ -483,8 +483,8 @@ def retranslateUi(self, ORStoolsDialogBase): self.routing_preference_combo.setToolTip(_translate("ORStoolsDialogBase", "Preference")) self.routing_fromline_map.setToolTip(_translate("ORStoolsDialogBase", "

Add wayoints interactively from the map canvas.

Double-click will terminate waypoint selection.

")) self.routing_fromline_clear.setToolTip(_translate("ORStoolsDialogBase", "

If waypoints are selected in the list, only these will be deleted. Else all waypoints will be deleted.

")) - self.save_vertices.setToolTip(_translate("ORStoolsDialogBase", "

Save points in list to layer.

")) self.routing_fromline_list.setToolTip(_translate("ORStoolsDialogBase", "Select waypoints from the map!")) + self.save_vertices.setToolTip(_translate("ORStoolsDialogBase", "

Save points in list to layer. Use the processing algorithms (batch jobs) to work with points from layers.

")) self.advances_group.setTitle(_translate("ORStoolsDialogBase", "Advanced Configuration")) self.optimization_group.setToolTip(_translate("ORStoolsDialogBase", "

Enabling Traveling Salesman will omit all other advanced configuration and assume the preference to be fastest.

")) self.optimization_group.setTitle(_translate("ORStoolsDialogBase", "Traveling Salesman")) diff --git a/ORStools/gui/ORStoolsDialogUI.ui b/ORStools/gui/ORStoolsDialogUI.ui index ce1c3253..81709fc0 100644 --- a/ORStools/gui/ORStoolsDialogUI.ui +++ b/ORStools/gui/ORStoolsDialogUI.ui @@ -361,6 +361,26 @@ + + + + + 0 + 0 + + + + <html><head/><body><p>Save points in list to layer. Use the processing algorithms (batch jobs) to work with points from layers.</p></body></html> + + + + + + + :/plugins/ORStools/img/save_vertices.png:/plugins/ORStools/img/save_vertices.png + + + diff --git a/ORStools/gui/linestyle.qml b/ORStools/gui/linestyle.qml index 34454262..84336893 100644 --- a/ORStools/gui/linestyle.qml +++ b/ORStools/gui/linestyle.qml @@ -1,360 +1,178 @@ - + 1 1 1 - 0 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + @@ -366,63 +184,46 @@ - + + + 0 0 1 - - - - + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -430,12 +231,12 @@ - + @@ -443,52 +244,52 @@ - + - + - + - + - + - + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - @@ -596,17 +397,6 @@ def my_form_open(dialog, layer, feature): - - - - - - - - - - - "new_field_name" diff --git a/ORStools/metadata.txt b/ORStools/metadata.txt index 05eca6b7..bf3b604b 100644 --- a/ORStools/metadata.txt +++ b/ORStools/metadata.txt @@ -3,25 +3,15 @@ name=ORS Tools qgisMinimumVersion=3.4.8 description=openrouteservice routing, isochrones and matrix calculations for QGIS -version=1.7.0 +version=1.7.1 author=HeiGIT gGmbH email=support@openrouteservice.heigit.org about=ORS Tools provides access to most of the functions of openrouteservice.org, based on OpenStreetMap. The tool set includes routing, isochrones and matrix calculations, either interactive in the map canvas or from point files within the processing framework. Extensive attributes are set for output files, incl. duration, length and start/end locations. -changelog=2023/12/25 v1.7.0 -### Added - - keyboard shortcut (CTRL-R) - - parameters for isochrones (`location_type` and `smoothing`) - - option to save points from GUI - -### Changed - - style of route output when using GUI - - drag-and-drop for points in GUI - -### Fixed - - handling of blue lines when drawing points - +changelog=2023/01/15 v1.7.1 + Fixed + - multiple minor issues regarding compatibility with older QGIS versions Complete changelog of all versions: https://github.com/GIScience/orstools-qgis-plugin/blob/main/CHANGELOG.md Wiki: https://github.com/GIScience/orstools-qgis-plugin/wiki diff --git a/ORStools/proc/base_processing_algorithm.py b/ORStools/proc/base_processing_algorithm.py index dc9f3fa4..206bc347 100644 --- a/ORStools/proc/base_processing_algorithm.py +++ b/ORStools/proc/base_processing_algorithm.py @@ -185,7 +185,7 @@ def _get_ors_client_from_provider( Connects client to provider and returns a client instance for requests to the ors API """ name = cls.__name__ - name = name.removeprefix("ORS").removesuffix("Algo") + name = name.replace("ORS", "").replace("Algo", "") agent = f"QGIS_{name}" providers = configmanager.read_config()["providers"]