From c4a4342372827a6706366b92a113fb47eacae506 Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Thu, 19 Sep 2024 17:01:50 +0200 Subject: [PATCH 1/2] Updated after changes in main SW --- .../OSMMapDiagram/doc/Documentation.md | 11 +- .../OSMMapDiagram/doc/Releasenotes.md | 5 + .../OSMMapDiagram/doc/Releasenotes.pdf | Bin 30690 -> 32756 bytes .../scripts/modules/requirements.txt | 3 +- .../OSMMapDiagram/scripts/service.py | 144 ++++++++---------- 5 files changed, 74 insertions(+), 89 deletions(-) diff --git a/AppExamples/scripted_diagrams/OSMMapDiagram/doc/Documentation.md b/AppExamples/scripted_diagrams/OSMMapDiagram/doc/Documentation.md index 8b6e929..c256c43 100644 --- a/AppExamples/scripted_diagrams/OSMMapDiagram/doc/Documentation.md +++ b/AppExamples/scripted_diagrams/OSMMapDiagram/doc/Documentation.md @@ -4,14 +4,10 @@ ## Short description -The script `LocationScalarElement.py` generates a scripted value element, which passes location information to the diagram service `OSMMapDiagram`. The service implemented in `service.py` creates a map from [OpenStreetMap](https://www.openstreetmap.org/) (OSM) data using the Python packages [Cartopy](https://scitools.org.uk/cartopy/docs/latest/index.html) and [Matplotlib](https://matplotlib.org/). The map's center is defined by the location data. The location markers and labels (optional) are added to the map. Some map configurations can be set via Preferences ► App-Settings. +The script `LocationScalarElement.py` generates a scripted value element, which passes location information to the diagram service `OSMMapDiagram`. The service implemented in `service.py` creates a map from [OpenStreetMap](https://www.openstreetmap.org/) (OSM) data using the Python packages [Cartopy](https://scitools.org.uk/cartopy/docs/latest/index.html), [Matplotlib](https://matplotlib.org/) and [NumPy](https://numpy.org/). The map's center is defined by the location data. The location markers and labels (optional) are added to the map. Some map configurations can be set via Preferences ► App-Settings. This example demonstrates the flexibility of scripted diagrams. It can be used for reporting of measurements acquired 'in the field', e.g. with ZEISS [T-SCAN hawk 2](https://www.handsonmetrology.com/products/t-scan-hawk-2/) or ZEISS [TRITOP](https://www.zeiss.com/metrology/en/systems/optical-3d/3d-photogrammetry/tritop.html). -> [!WARNING] -> Only one service function may be used at a time. -> All diagram services currently not in use must be stopped, otherwise no diagram is created. - Location information can be provided by * Manual input in the GeoLocation element creation dialog * Element keywords of any element @@ -37,8 +33,7 @@ The location information is passed as parameters to the scripted diagram service context.data[stage] = { "ude_diagram_custom": 1, # mandatory, fixed "ude_diagram_type": "SVGDiagram", # mandatory, fixed - "ude_diagram_alt": , # altitude - "ude_diagram_alt_en": , # True or False + "ude_diagram_alt": , # altitude, can be None "ude_diagram_label": '